]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
serial: sh-sci: Don't check for mctrl_gpio_init() returning -ENOSYS
authorFrieder Schrempf <frieder.schrempf@kontron.de>
Fri, 2 Aug 2019 10:04:10 +0000 (10:04 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 4 Sep 2019 10:43:50 +0000 (12:43 +0200)
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 <frieder.schrempf@kontron.de>
Acked-by: Uwe Kleine-Knig <u.kleine-koenig@pengutronix.de>
Link: https://lore.kernel.org/r/20190802100349.8659-3-frieder.schrempf@kontron.de
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/serial/sh-sci.c

index 7a03622cdda93be6cd1d0a5681375531da7e2359..7f565fcbf1ca4c5ef6d52917f801e7f20e725d2e 100644 (file)
@@ -3281,7 +3281,7 @@ static int sci_probe_single(struct platform_device *dev,
                return ret;
 
        sciport->gpios = mctrl_gpio_init(&sciport->port, 0);
-       if (IS_ERR(sciport->gpios) && PTR_ERR(sciport->gpios) != -ENOSYS)
+       if (IS_ERR(sciport->gpios))
                return PTR_ERR(sciport->gpios);
 
        if (sciport->has_rtscts) {