diff options
| author | Jiri Slaby <jslaby@suse.cz> | 2021-07-14 11:13:10 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-07-21 12:49:51 +0200 |
| commit | 935256192996de6317e3afe5dc1b2f8d9c210afd (patch) | |
| tree | 392d4950a8d60924e49825c6ca1c58535ff1c76c | |
| parent | 5d4317abd2223eea5884f7e28d1047d5e87d4a6f (diff) | |
| download | linux-935256192996de6317e3afe5dc1b2f8d9c210afd.tar.bz2 | |
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>
| -rw-r--r-- | drivers/tty/amiserial.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/drivers/tty/amiserial.c b/drivers/tty/amiserial.c index 558c77653e21..51b51c5acf96 100644 --- 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) || |