aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpio/gpio-crystalcove.c
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2014-09-16 18:11:41 -0400
committerLinus Walleij <linus.walleij@linaro.org>2014-09-23 11:51:17 -0400
commitda26d5d803e45a30c7d72b83ce906f3a466f4cc3 (patch)
tree43b7bac272c85efd85c037e0343d264ff923c443 /drivers/gpio/gpio-crystalcove.c
parent2fcea6cecbc965b4e02a39537d9d939f5251bbbd (diff)
gpio: remove remaining users of gpiochip_remove() retval
Some drivers accidentally still use the return value from gpiochip_remove(). Get rid of them so we can simplify this function and get rid of the return value. Cc: Abdoulaye Berthe <berthe.ab@gmail.com> Acked-by: Alexandre Courbot <acourbot@nvidia.com> Acked-by: Javier Martinez Canillas <javier@dowhile0.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/gpio/gpio-crystalcove.c')
-rw-r--r--drivers/gpio/gpio-crystalcove.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/gpio/gpio-crystalcove.c b/drivers/gpio/gpio-crystalcove.c
index 934462f5bd22..e3712f0e51ab 100644
--- a/drivers/gpio/gpio-crystalcove.c
+++ b/drivers/gpio/gpio-crystalcove.c
@@ -346,7 +346,7 @@ static int crystalcove_gpio_probe(struct platform_device *pdev)
346 return 0; 346 return 0;
347 347
348out_remove_gpio: 348out_remove_gpio:
349 WARN_ON(gpiochip_remove(&cg->chip)); 349 gpiochip_remove(&cg->chip);
350 return retval; 350 return retval;
351} 351}
352 352
@@ -354,14 +354,11 @@ static int crystalcove_gpio_remove(struct platform_device *pdev)
354{ 354{
355 struct crystalcove_gpio *cg = platform_get_drvdata(pdev); 355 struct crystalcove_gpio *cg = platform_get_drvdata(pdev);
356 int irq = platform_get_irq(pdev, 0); 356 int irq = platform_get_irq(pdev, 0);
357 int err;
358
359 err = gpiochip_remove(&cg->chip);
360 357
358 gpiochip_remove(&cg->chip);
361 if (irq >= 0) 359 if (irq >= 0)
362 free_irq(irq, cg); 360 free_irq(irq, cg);
363 361 return 0;
364 return err;
365} 362}
366 363
367static struct platform_driver crystalcove_gpio_driver = { 364static struct platform_driver crystalcove_gpio_driver = {