treewide: another round of simplifications

Using the same scripts as in f647962d64e "treewide: yet more log_*_errno
+ return simplifications".

2 files changed, 4 insertions, 8 deletions

diff --git a/src/login/logind-button.c b/src/login/logind-button.c
index 1afb01fc68..e22b106b3c 100644
--- a/src/login/logind-button.c
+++ b/src/login/logind-button.c
@@ -250,10 +250,8 @@ int button_open(Button *b) {
         p = strappenda("/dev/input/", b->name);
 
         b->fd = open(p, O_RDWR|O_CLOEXEC|O_NOCTTY|O_NONBLOCK);
-        if (b->fd < 0) {
-                log_warning_errno(errno, "Failed to open %s: %m", b->name);
-                return -errno;
-        }
+        if (b->fd < 0)
+                return log_warning_errno(errno, "Failed to open %s: %m", b->name);
 
         if (ioctl(b->fd, EVIOCGNAME(sizeof(name)), name) < 0) {
                 log_error_errno(errno, "Failed to get input name: %m");
diff --git a/src/login/logind-session.c b/src/login/logind-session.c
index c1800e0854..ea1831dac6 100644
--- a/src/login/logind-session.c
+++ b/src/login/logind-session.c
@@ -967,10 +967,8 @@ static int session_open_vt(Session *s) {
 
         sprintf(path, "/dev/tty%u", s->vtnr);
         s->vtfd = open(path, O_RDWR | O_CLOEXEC | O_NONBLOCK | O_NOCTTY);
-        if (s->vtfd < 0) {
-                log_error_errno(errno, "cannot open VT %s of session %s: %m", path, s->id);
-                return -errno;
-        }
+        if (s->vtfd < 0)
+                return log_error_errno(errno, "cannot open VT %s of session %s: %m", path, s->id);
 
         return s->vtfd;
 }