evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tty: sc16is7xx: remove retval from gpiochip_remove()

Browse source 
We are trying to smoke out the use of the return value from
gpiochip_remove() from the kernel, this has been missed.

Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Linus Walleij 2014-09-16 15:14:46 -07:00
parent da26d5d803
commit e27e278608
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
drivers/tty/serial/sc16is7xx.c
View file

@ -1157,7 +1157,7 @@ static int sc16is7xx_probe(struct device *dev,
#ifdef CONFIG_GPIOLIB #ifdef CONFIG_GPIOLIB
if (devtype->nr_gpio) if (devtype->nr_gpio)
WARN_ON(gpiochip_remove(&s->gpio)); gpiochip_remove(&s->gpio);
out_uart: out_uart:
#endif #endif
@ -1173,14 +1173,11 @@ out_clk:
static int sc16is7xx_remove(struct device *dev) static int sc16is7xx_remove(struct device *dev)
{ {
struct sc16is7xx_port *s = dev_get_drvdata(dev); struct sc16is7xx_port *s = dev_get_drvdata(dev);
int i, ret = 0; int i;
#ifdef CONFIG_GPIOLIB #ifdef CONFIG_GPIOLIB
if (s->devtype->nr_gpio) { if (s->devtype->nr_gpio)
ret = gpiochip_remove(&s->gpio); gpiochip_remove(&s->gpio);
if (ret)
return ret;
}
#endif #endif
for (i = 0; i < s->uart.nr; i++) { for (i = 0; i < s->uart.nr; i++) {
@ -1195,7 +1192,7 @@ static int sc16is7xx_remove(struct device *dev)
if (!IS_ERR(s->clk)) if (!IS_ERR(s->clk))
clk_disable_unprepare(s->clk); clk_disable_unprepare(s->clk);
return ret; return 0;
} }
static const struct of_device_id __maybe_unused sc16is7xx_dt_ids[] = { static const struct of_device_id __maybe_unused sc16is7xx_dt_ids[] = {