tty: Clean up tiocmset

Reverse the order of one test and it gets much more readable

Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 22 insertions, 26 deletions

diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
index 739c9c59fc62..a8cc416a23c0 100644
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
@@ -3515,35 +3515,31 @@ static int tty_tiocmget(struct tty_struct *tty, struct file *file, int __user *p
 static int tty_tiocmset(struct tty_struct *tty, struct file *file, unsigned int cmd,
              unsigned __user *p)
 {
-        int retval = -EINVAL;
-
-        if (tty->ops->tiocmset) {
-                unsigned int set, clear, val;
-
-                retval = get_user(val, p);
-                if (retval)
-                        return retval;
-
-                set = clear = 0;
-                switch (cmd) {
-                case TIOCMBIS:
-                        set = val;
-                        break;
-                case TIOCMBIC:
-                        clear = val;
-                        break;
-                case TIOCMSET:
-                        set = val;
-                        clear = ~val;
-                        break;
-                }
+        int retval;
+        unsigned int set, clear, val;
 
-                set &= TIOCM_DTR|TIOCM_RTS|TIOCM_OUT1|TIOCM_OUT2|TIOCM_LOOP;
-                clear &= TIOCM_DTR|TIOCM_RTS|TIOCM_OUT1|TIOCM_OUT2|TIOCM_LOOP;
+        if (tty->ops->tiocmset == NULL)
+                return -EINVAL;
 
-                retval = tty->ops->tiocmset(tty, file, set, clear);
+        retval = get_user(val, p);
+        if (retval)
+                return retval;
+        set = clear = 0;
+        switch (cmd) {
+        case TIOCMBIS:
+                set = val;
+                break;
+        case TIOCMBIC:
+                clear = val;
+                break;
+        case TIOCMSET:
+                set = val;
+                clear = ~val;
+                break;
         }
-        return retval;
+        set &= TIOCM_DTR|TIOCM_RTS|TIOCM_OUT1|TIOCM_OUT2|TIOCM_LOOP;
+        clear &= TIOCM_DTR|TIOCM_RTS|TIOCM_OUT1|TIOCM_OUT2|TIOCM_LOOP;
+        return tty->ops->tiocmset(tty, file, set, clear);
 }
 
 /*