diff options
| -rw-r--r-- | drivers/tty/serial/atmel_serial.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/tty/serial/atmel_serial.c b/drivers/tty/serial/atmel_serial.c index d067285a2d20..6b0f75eac8a2 100644 --- a/drivers/tty/serial/atmel_serial.c +++ b/drivers/tty/serial/atmel_serial.c | |||
| @@ -1499,7 +1499,7 @@ static void atmel_set_ops(struct uart_port *port) | |||
| 1499 | /* | 1499 | /* |
| 1500 | * Get ip name usart or uart | 1500 | * Get ip name usart or uart |
| 1501 | */ | 1501 | */ |
| 1502 | static int atmel_get_ip_name(struct uart_port *port) | 1502 | static void atmel_get_ip_name(struct uart_port *port) |
| 1503 | { | 1503 | { |
| 1504 | struct atmel_uart_port *atmel_port = to_atmel_uart_port(port); | 1504 | struct atmel_uart_port *atmel_port = to_atmel_uart_port(port); |
| 1505 | int name = UART_GET_IP_NAME(port); | 1505 | int name = UART_GET_IP_NAME(port); |
| @@ -1518,10 +1518,7 @@ static int atmel_get_ip_name(struct uart_port *port) | |||
| 1518 | atmel_port->is_usart = false; | 1518 | atmel_port->is_usart = false; |
| 1519 | } else { | 1519 | } else { |
| 1520 | dev_err(port->dev, "Not supported ip name, set to uart\n"); | 1520 | dev_err(port->dev, "Not supported ip name, set to uart\n"); |
| 1521 | return -EINVAL; | ||
| 1522 | } | 1521 | } |
| 1523 | |||
| 1524 | return 0; | ||
| 1525 | } | 1522 | } |
| 1526 | 1523 | ||
| 1527 | /* | 1524 | /* |
| @@ -2405,9 +2402,7 @@ static int atmel_serial_probe(struct platform_device *pdev) | |||
| 2405 | /* | 2402 | /* |
| 2406 | * Get port name of usart or uart | 2403 | * Get port name of usart or uart |
| 2407 | */ | 2404 | */ |
| 2408 | ret = atmel_get_ip_name(&port->uart); | 2405 | atmel_get_ip_name(&port->uart); |
| 2409 | if (ret < 0) | ||
| 2410 | goto err_add_port; | ||
| 2411 | 2406 | ||
| 2412 | return 0; | 2407 | return 0; |
| 2413 | 2408 | ||
