| Message ID | 1412086542-1662-1-git-send-email-pramod.gurav@smartplayin.com |
|---|---|
| State | Rejected, archived |
| Headers | show |
On Tue, Sep 30, 2014 at 4:15 PM, Pramod Gurav <pramod.gurav@smartplayin.com> wrote: > Some driver in gpio still check for return value from gpiochip_remove > Get rid of the check for return value. > > Cc: Linus Walleij <linus.walleij@linaro.org> > Cc: Alexandre Courbot <gnurou@gmail.com> > Cc: linux-gpio@vger.kernel.org > > Signed-off-by: Pramod Gurav <pramod.gurav@smartplayin.com> This is already fixed in the GPIO tree, and in linux-next. I have got more patches like this from other people, and cannot quite understand what kind of tree you are actually looking at? Yours, Linus Walleij -- To unsubscribe from this list: send the line "unsubscribe linux-gpio" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wednesday 01 October 2014 01:13 PM, Linus Walleij wrote: > On Tue, Sep 30, 2014 at 4:15 PM, Pramod Gurav > <pramod.gurav@smartplayin.com> wrote: > >> Some driver in gpio still check for return value from gpiochip_remove >> Get rid of the check for return value. >> >> Cc: Linus Walleij <linus.walleij@linaro.org> >> Cc: Alexandre Courbot <gnurou@gmail.com> >> Cc: linux-gpio@vger.kernel.org >> >> Signed-off-by: Pramod Gurav <pramod.gurav@smartplayin.com> > > This is already fixed in the GPIO tree, and in linux-next. > > I have got more patches like this from other people, and cannot > quite understand what kind of tree you are actually looking at? > Sorry for this Linus. I have applied these patches on linux-next's 3.17-rc6. Just checked the other patch fixing these have come after rc6. Should have done on master or gpio tree master. Will be more careful next time. > Yours, > Linus Walleij > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ > -- To unsubscribe from this list: send the line "unsubscribe linux-gpio" 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/gpio/gpio-crystalcove.c b/drivers/gpio/gpio-crystalcove.c index 934462f..0345b94 100644 --- a/drivers/gpio/gpio-crystalcove.c +++ b/drivers/gpio/gpio-crystalcove.c @@ -346,22 +346,18 @@ static int crystalcove_gpio_probe(struct platform_device *pdev) return 0; out_remove_gpio: - WARN_ON(gpiochip_remove(&cg->chip)); + gpiochip_remove(&cg->chip); return retval; } static int crystalcove_gpio_remove(struct platform_device *pdev) { struct crystalcove_gpio *cg = platform_get_drvdata(pdev); - int irq = platform_get_irq(pdev, 0); - int err; - - err = gpiochip_remove(&cg->chip); + platform_get_irq(pdev, 0); - if (irq >= 0) - free_irq(irq, cg); + gpiochip_remove(&cg->chip); - return err; + return 0; } static struct platform_driver crystalcove_gpio_driver = { diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c index 1749321..5cd3367 100644 --- a/drivers/gpio/gpio-omap.c +++ b/drivers/gpio/gpio-omap.c @@ -1143,7 +1143,7 @@ static int omap_gpio_chip_init(struct gpio_bank *bank) if (ret) { dev_err(bank->dev, "Couldn't add irqchip to gpiochip %d\n", ret); - ret = gpiochip_remove(&bank->chip); + gpiochip_remove(&bank->chip); return -ENODEV; } diff --git a/drivers/gpio/gpio-zynq.c b/drivers/gpio/gpio-zynq.c index 31ad5df..13c677a 100644 --- a/drivers/gpio/gpio-zynq.c +++ b/drivers/gpio/gpio-zynq.c @@ -648,8 +648,7 @@ static int zynq_gpio_probe(struct platform_device *pdev) return 0; err_rm_gpiochip: - if (gpiochip_remove(chip)) - dev_err(&pdev->dev, "Failed to remove gpio chip\n"); + gpiochip_remove(chip); err_disable_clk: clk_disable_unprepare(gpio->clk); @@ -664,16 +663,11 @@ err_disable_clk: */ static int zynq_gpio_remove(struct platform_device *pdev) { - int ret; struct zynq_gpio *gpio = platform_get_drvdata(pdev); pm_runtime_get_sync(&pdev->dev); - ret = gpiochip_remove(&gpio->chip); - if (ret) { - dev_err(&pdev->dev, "Failed to remove gpio chip\n"); - return ret; - } + gpiochip_remove(&gpio->chip); clk_disable_unprepare(gpio->clk); device_set_wakeup_capable(&pdev->dev, 0); return 0;
Some driver in gpio still check for return value from gpiochip_remove Get rid of the check for return value. Cc: Linus Walleij <linus.walleij@linaro.org> Cc: Alexandre Courbot <gnurou@gmail.com> Cc: linux-gpio@vger.kernel.org Signed-off-by: Pramod Gurav <pramod.gurav@smartplayin.com> --- drivers/gpio/gpio-crystalcove.c | 12 ++++-------- drivers/gpio/gpio-omap.c | 2 +- drivers/gpio/gpio-zynq.c | 10 ++-------- 3 files changed, 7 insertions(+), 17 deletions(-)