Skip to content

Commit 2667bd6

Browse files
Jiri Slaby (SUSE)gregkh
authored andcommitted
serial: 8250_port: simplify serial8250_request_std_resource()
Return immediately from the error locations or switch-case ends. It is therefore easier to see the flow. Signed-off-by: Jiri Slaby (SUSE) <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent dc7d366 commit 2667bd6

File tree

1 file changed

+10
-15
lines changed

1 file changed

+10
-15
lines changed

drivers/tty/serial/8250/8250_port.c

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2966,7 +2966,6 @@ static int serial8250_request_std_resource(struct uart_8250_port *up)
29662966
{
29672967
unsigned int size = serial8250_port_size(up);
29682968
struct uart_port *port = &up->port;
2969-
int ret = 0;
29702969

29712970
switch (port->iotype) {
29722971
case UPIO_AU:
@@ -2975,32 +2974,28 @@ static int serial8250_request_std_resource(struct uart_8250_port *up)
29752974
case UPIO_MEM32BE:
29762975
case UPIO_MEM16:
29772976
case UPIO_MEM:
2978-
if (!port->mapbase) {
2979-
ret = -EINVAL;
2980-
break;
2981-
}
2977+
if (!port->mapbase)
2978+
return -EINVAL;
29822979

2983-
if (!request_mem_region(port->mapbase, size, "serial")) {
2984-
ret = -EBUSY;
2985-
break;
2986-
}
2980+
if (!request_mem_region(port->mapbase, size, "serial"))
2981+
return -EBUSY;
29872982

29882983
if (port->flags & UPF_IOREMAP) {
29892984
port->membase = ioremap(port->mapbase, size);
29902985
if (!port->membase) {
29912986
release_mem_region(port->mapbase, size);
2992-
ret = -ENOMEM;
2987+
return -ENOMEM;
29932988
}
29942989
}
2995-
break;
2996-
2990+
return 0;
29972991
case UPIO_HUB6:
29982992
case UPIO_PORT:
29992993
if (!request_region(port->iobase, size, "serial"))
3000-
ret = -EBUSY;
3001-
break;
2994+
return -EBUSY;
2995+
return 0;
30022996
}
3003-
return ret;
2997+
2998+
return 0;
30042999
}
30053000

30063001
static void serial8250_release_std_resource(struct uart_8250_port *up)

0 commit comments

Comments
 (0)