aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mfd/tc6393xb.c
diff options
context:
space:
mode:
authorabdoulaye berthe <berthe.ab@gmail.com>2014-07-12 16:30:14 -0400
committerLinus Walleij <linus.walleij@linaro.org>2014-09-18 14:03:10 -0400
commit88d5e520aa9701eb3e4f46165e02097cc03d363a (patch)
tree443b8f89eeaf8933a9d3af2c9928cf0008aa35fd /drivers/mfd/tc6393xb.c
parent2134cb997f2f1b2d960ad8705d67dc8d690ba59c (diff)
driver:gpio remove all usage of gpio_remove retval in driver
this remove all reference to gpio_remove retval in all driver except pinctrl and gpio. the same thing is done for gpio and pinctrl in two different patches. Signed-off-by: Abdoulaye Berthe <berthe.ab@gmail.com> Acked-by: Michael Büsch <m@bues.ch> Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Acked-by: Mauro Carvalho Chehab <m.chehab@samsung.com> Acked-by: Tomi Valkeinen <tomi.valkeinen@ti.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/mfd/tc6393xb.c')
-rw-r--r--drivers/mfd/tc6393xb.c13
1 files changed, 4 insertions, 9 deletions
diff --git a/drivers/mfd/tc6393xb.c b/drivers/mfd/tc6393xb.c
index 11c19e538551..4fac16bcd732 100644
--- a/drivers/mfd/tc6393xb.c
+++ b/drivers/mfd/tc6393xb.c
@@ -607,7 +607,7 @@ static int tc6393xb_probe(struct platform_device *dev)
607 struct tc6393xb_platform_data *tcpd = dev_get_platdata(&dev->dev); 607 struct tc6393xb_platform_data *tcpd = dev_get_platdata(&dev->dev);
608 struct tc6393xb *tc6393xb; 608 struct tc6393xb *tc6393xb;
609 struct resource *iomem, *rscr; 609 struct resource *iomem, *rscr;
610 int ret, temp; 610 int ret;
611 611
612 iomem = platform_get_resource(dev, IORESOURCE_MEM, 0); 612 iomem = platform_get_resource(dev, IORESOURCE_MEM, 0);
613 if (!iomem) 613 if (!iomem)
@@ -714,7 +714,7 @@ err_setup:
714 714
715err_gpio_add: 715err_gpio_add:
716 if (tc6393xb->gpio.base != -1) 716 if (tc6393xb->gpio.base != -1)
717 temp = gpiochip_remove(&tc6393xb->gpio); 717 gpiochip_remove(&tc6393xb->gpio);
718 tcpd->disable(dev); 718 tcpd->disable(dev);
719err_enable: 719err_enable:
720 clk_disable(tc6393xb->clk); 720 clk_disable(tc6393xb->clk);
@@ -744,13 +744,8 @@ static int tc6393xb_remove(struct platform_device *dev)
744 744
745 tc6393xb_detach_irq(dev); 745 tc6393xb_detach_irq(dev);
746 746
747 if (tc6393xb->gpio.base != -1) { 747 if (tc6393xb->gpio.base != -1)
748 ret = gpiochip_remove(&tc6393xb->gpio); 748 gpiochip_remove(&tc6393xb->gpio);
749 if (ret) {
750 dev_err(&dev->dev, "Can't remove gpio chip: %d\n", ret);
751 return ret;
752 }
753 }
754 749
755 ret = tcpd->disable(dev); 750 ret = tcpd->disable(dev);
756 clk_disable(tc6393xb->clk); 751 clk_disable(tc6393xb->clk);