amiserial: expand serial_isroot

Having a macro (serial_isroot) for capable(CAP_SYS_ADMIN) does not save
us from anything. It rather obfuscates the code. Hence expand
serial_isroot to be explicit like every other driver is.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Link: https://lore.kernel.org/r/20210714091314.8292-7-jslaby@suse.cz
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/tty/amiserial.c b/drivers/tty/amiserial.c
index 558c776..51b51c5 100644 (file)
--- a/drivers/tty/amiserial.c
+++ b/drivers/tty/amiserial.c
@@ -109,8 +109,6 @@ static struct serial_state rs_table[1];
 
 #include <linux/uaccess.h>
 
-#define serial_isroot()        (capable(CAP_SYS_ADMIN))
-
 /* some serial hardware definitions */
 #define SDR_OVRUN   (1<<15)
 #define SDR_RBF     (1<<14)
@@ -485,11 +483,11 @@ static int startup(struct tty_struct *tty, struct serial_state *info)
 
        retval = request_irq(IRQ_AMIGA_VERTB, ser_vbl_int, 0, "serial status", info);
        if (retval) {
-         if (serial_isroot()) {
-             set_bit(TTY_IO_ERROR, &tty->flags);
-           retval = 0;
-         }
-         goto errout;
+               if (capable(CAP_SYS_ADMIN)) {
+                       set_bit(TTY_IO_ERROR, &tty->flags);
+                       retval = 0;
+               }
+               goto errout;
        }
 
        /* enable both Rx and Tx interrupts */
@@ -955,7 +953,7 @@ static int set_serial_info(struct tty_struct *tty, struct serial_struct *ss)
        if (closing_wait != ASYNC_CLOSING_WAIT_NONE)
                closing_wait = msecs_to_jiffies(closing_wait * 10);
 
-       if (!serial_isroot()) {
+       if (!capable(CAP_SYS_ADMIN)) {
                if ((ss->baud_base != state->baud_base) ||
                    (close_delay != port->close_delay) ||
                    (closing_wait != port->closing_wait) ||