]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
serial: 8250_rsa: simplify rsa8250_{request/release}_resource()
authorJiri Slaby (SUSE) <jirislaby@kernel.org>
Mon, 17 Mar 2025 07:00:43 +0000 (08:00 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 20 Mar 2025 15:00:52 +0000 (08:00 -0700)
* Use already defined 'port' for fetching start/offset, and size.
* Return from the switch immediately -- so it is clear what is returned
  and when.

Signed-off-by: Jiri Slaby (SUSE) <jirislaby@kernel.org>
Link: https://lore.kernel.org/r/20250317070046.24386-29-jirislaby@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/serial/8250/8250_rsa.c

index dfaa613e452d1b8ee9e73a7c139e353640f69883..82f2593b4c59b39e08022cd08d4e8a2fd649a708 100644 (file)
@@ -16,30 +16,27 @@ static unsigned int probe_rsa_count;
 
 static int rsa8250_request_resource(struct uart_8250_port *up)
 {
-       unsigned long start = UART_RSA_BASE << up->port.regshift;
-       unsigned int size = 8 << up->port.regshift;
        struct uart_port *port = &up->port;
-       int ret = -EINVAL;
+       unsigned long start = UART_RSA_BASE << port->regshift;
+       unsigned int size = 8 << port->regshift;
 
        switch (port->iotype) {
        case UPIO_HUB6:
        case UPIO_PORT:
                start += port->iobase;
-               if (request_region(start, size, "serial-rsa"))
-                       ret = 0;
-               else
-                       ret = -EBUSY;
-               break;
+               if (!request_region(start, size, "serial-rsa"))
+                       return -EBUSY;
+               return 0;
+       default:
+               return -EINVAL;
        }
-
-       return ret;
 }
 
 static void rsa8250_release_resource(struct uart_8250_port *up)
 {
-       unsigned long offset = UART_RSA_BASE << up->port.regshift;
-       unsigned int size = 8 << up->port.regshift;
        struct uart_port *port = &up->port;
+       unsigned long offset = UART_RSA_BASE << port->regshift;
+       unsigned int size = 8 << port->regshift;
 
        switch (port->iotype) {
        case UPIO_HUB6: