mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-24 01:41:39 +00:00
tty: sc16is7xx: remove retval from gpiochip_remove()
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:
parent
da26d5d803
commit
e27e278608
1 changed files with 5 additions and 8 deletions
|
@ -1157,7 +1157,7 @@ static int sc16is7xx_probe(struct device *dev,
|
|||
|
||||
#ifdef CONFIG_GPIOLIB
|
||||
if (devtype->nr_gpio)
|
||||
WARN_ON(gpiochip_remove(&s->gpio));
|
||||
gpiochip_remove(&s->gpio);
|
||||
|
||||
out_uart:
|
||||
#endif
|
||||
|
@ -1173,14 +1173,11 @@ static int sc16is7xx_probe(struct device *dev,
|
|||
static int sc16is7xx_remove(struct device *dev)
|
||||
{
|
||||
struct sc16is7xx_port *s = dev_get_drvdata(dev);
|
||||
int i, ret = 0;
|
||||
int i;
|
||||
|
||||
#ifdef CONFIG_GPIOLIB
|
||||
if (s->devtype->nr_gpio) {
|
||||
ret = gpiochip_remove(&s->gpio);
|
||||
if (ret)
|
||||
return ret;
|
||||
}
|
||||
if (s->devtype->nr_gpio)
|
||||
gpiochip_remove(&s->gpio);
|
||||
#endif
|
||||
|
||||
for (i = 0; i < s->uart.nr; i++) {
|
||||
|
@ -1195,7 +1192,7 @@ static int sc16is7xx_remove(struct device *dev)
|
|||
if (!IS_ERR(s->clk))
|
||||
clk_disable_unprepare(s->clk);
|
||||
|
||||
return ret;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const struct of_device_id __maybe_unused sc16is7xx_dt_ids[] = {
|
||||
|
|
Loading…
Reference in a new issue