| Message ID | 1410905815-22970-1-git-send-email-linus.walleij@linaro.org |
|---|---|
| State | Accepted |
| Commit | e27e278608d0dca1b97abea3c1855beafcc68bcb |
| Headers | show |
On Tue, Sep 16, 2014 at 03:16:55PM -0700, Linus Walleij wrote: > We are trying to smoke out the use of the return value from > gpiochip_remove() from the kernel, this has been missed. > > Signed-off-by: Linus Walleij <linus.walleij@linaro.org> > --- > Greg, can you ACK this so I can merge it into the GPIO tree along > with the removal of the actual return value. > --- > drivers/tty/serial/sc16is7xx.c | 9 +++------ > 1 file changed, 3 insertions(+), 6 deletions(-) Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -- To unsubscribe from this list: send the line "unsubscribe linux-serial" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/tty/serial/sc16is7xx.c b/drivers/tty/serial/sc16is7xx.c index 3284c31085a7..b534396b9568 100644 --- a/drivers/tty/serial/sc16is7xx.c +++ b/drivers/tty/serial/sc16is7xx.c @@ -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 @@ -1176,11 +1176,8 @@ static int sc16is7xx_remove(struct device *dev) int i, ret = 0; #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++) {
We are trying to smoke out the use of the return value from gpiochip_remove() from the kernel, this has been missed. Signed-off-by: Linus Walleij <linus.walleij@linaro.org> --- Greg, can you ACK this so I can merge it into the GPIO tree along with the removal of the actual return value. --- drivers/tty/serial/sc16is7xx.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)