]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
serial: 8250_port: simplify serial8250_request_std_resource()
authorJiri Slaby (SUSE) <jirislaby@kernel.org>
Mon, 17 Mar 2025 07:00:45 +0000 (08:00 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 20 Mar 2025 15:00:52 +0000 (08:00 -0700)
Return immediately from the error locations or switch-case ends. It is
therefore easier to see the flow.

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

index 6466f60416a9fe43fc0ab344fcc9f95428465d4b..8ac452cea36c6ea0f3f0af5df99ac5ce10a8b1af 100644 (file)
@@ -2966,7 +2966,6 @@ static int serial8250_request_std_resource(struct uart_8250_port *up)
 {
        unsigned int size = serial8250_port_size(up);
        struct uart_port *port = &up->port;
-       int ret = 0;
 
        switch (port->iotype) {
        case UPIO_AU:
@@ -2975,32 +2974,28 @@ static int serial8250_request_std_resource(struct uart_8250_port *up)
        case UPIO_MEM32BE:
        case UPIO_MEM16:
        case UPIO_MEM:
-               if (!port->mapbase) {
-                       ret = -EINVAL;
-                       break;
-               }
+               if (!port->mapbase)
+                       return -EINVAL;
 
-               if (!request_mem_region(port->mapbase, size, "serial")) {
-                       ret = -EBUSY;
-                       break;
-               }
+               if (!request_mem_region(port->mapbase, size, "serial"))
+                       return -EBUSY;
 
                if (port->flags & UPF_IOREMAP) {
                        port->membase = ioremap(port->mapbase, size);
                        if (!port->membase) {
                                release_mem_region(port->mapbase, size);
-                               ret = -ENOMEM;
+                               return -ENOMEM;
                        }
                }
-               break;
-
+               return 0;
        case UPIO_HUB6:
        case UPIO_PORT:
                if (!request_region(port->iobase, size, "serial"))
-                       ret = -EBUSY;
-               break;
+                       return -EBUSY;
+               return 0;
        }
-       return ret;
+
+       return 0;
 }
 
 static void serial8250_release_std_resource(struct uart_8250_port *up)