diff options
| author | Frieder Schrempf <[email protected]> | 2019-08-02 10:04:11 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <[email protected]> | 2019-09-04 12:43:50 +0200 |
| commit | 3d7514da039186729f823db789193002730151c7 (patch) | |
| tree | 9715e09d6289775546669af9987b81562a933499 | |
| parent | e55a09732be9b4e13cf3b5d2b9bb41b3e60e5ea6 (diff) | |
serial: 8250: Don't check for mctrl_gpio_init() returning -ENOSYS
Now that the mctrl_gpio code returns NULL instead of ERR_PTR(-ENOSYS)
if CONFIG_GPIOLIB is disabled, we can safely remove this check.
Signed-off-by: Frieder Schrempf <[email protected]>
Acked-by: Uwe Kleine-Knig <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Greg Kroah-Hartman <[email protected]>
| -rw-r--r-- | drivers/tty/serial/8250/8250_core.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/tty/serial/8250/8250_core.c b/drivers/tty/serial/8250/8250_core.c index df3bcc0b2d74..e682390ce0de 100644 --- a/drivers/tty/serial/8250/8250_core.c +++ b/drivers/tty/serial/8250/8250_core.c @@ -1026,10 +1026,8 @@ int serial8250_register_8250_port(struct uart_8250_port *up) if (!has_acpi_companion(uart->port.dev)) { gpios = mctrl_gpio_init(&uart->port, 0); if (IS_ERR(gpios)) { - if (PTR_ERR(gpios) != -ENOSYS) { - ret = PTR_ERR(gpios); - goto out_unlock; - } + ret = PTR_ERR(gpios); + goto out_unlock; } else { uart->gpios = gpios; } |