File tree Expand file tree Collapse file tree 1 file changed +10
-15
lines changed Expand file tree Collapse file tree 1 file changed +10
-15
lines changed Original file line number Diff line number Diff line change @@ -2966,7 +2966,6 @@ static int serial8250_request_std_resource(struct uart_8250_port *up)
2966
2966
{
2967
2967
unsigned int size = serial8250_port_size (up );
2968
2968
struct uart_port * port = & up -> port ;
2969
- int ret = 0 ;
2970
2969
2971
2970
switch (port -> iotype ) {
2972
2971
case UPIO_AU :
@@ -2975,32 +2974,28 @@ static int serial8250_request_std_resource(struct uart_8250_port *up)
2975
2974
case UPIO_MEM32BE :
2976
2975
case UPIO_MEM16 :
2977
2976
case UPIO_MEM :
2978
- if (!port -> mapbase ) {
2979
- ret = - EINVAL ;
2980
- break ;
2981
- }
2977
+ if (!port -> mapbase )
2978
+ return - EINVAL ;
2982
2979
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 ;
2987
2982
2988
2983
if (port -> flags & UPF_IOREMAP ) {
2989
2984
port -> membase = ioremap (port -> mapbase , size );
2990
2985
if (!port -> membase ) {
2991
2986
release_mem_region (port -> mapbase , size );
2992
- ret = - ENOMEM ;
2987
+ return - ENOMEM ;
2993
2988
}
2994
2989
}
2995
- break ;
2996
-
2990
+ return 0 ;
2997
2991
case UPIO_HUB6 :
2998
2992
case UPIO_PORT :
2999
2993
if (!request_region (port -> iobase , size , "serial" ))
3000
- ret = - EBUSY ;
3001
- break ;
2994
+ return - EBUSY ;
2995
+ return 0 ;
3002
2996
}
3003
- return ret ;
2997
+
2998
+ return 0 ;
3004
2999
}
3005
3000
3006
3001
static void serial8250_release_std_resource (struct uart_8250_port * up )
You can’t perform that action at this time.
0 commit comments