mfd: asic3: Make asic3_gpio_remove() return void

[linux-2.6-microblaze.git] / drivers / mfd / asic3.c

diff --git a/drivers/mfd/asic3.c b/drivers/mfd/asic3.c
index 56338f9..4fb7e35 100644 (file)
--- a/drivers/mfd/asic3.c
+++ b/drivers/mfd/asic3.c
@@ -596,12 +596,11 @@ static __init int asic3_gpio_probe(struct platform_device *pdev,
        return gpiochip_add_data(&asic->gpio, asic);
 }
 
-static int asic3_gpio_remove(struct platform_device *pdev)
+static void asic3_gpio_remove(struct platform_device *pdev)
 {
        struct asic3 *asic = platform_get_drvdata(pdev);
 
        gpiochip_remove(&asic->gpio);
-       return 0;
 }
 
 static void asic3_clk_enable(struct asic3 *asic, struct asic3_clk *clk)
@@ -1030,7 +1029,6 @@ static int __init asic3_probe(struct platform_device *pdev)
 
 static int asic3_remove(struct platform_device *pdev)
 {
-       int ret;
        struct asic3 *asic = platform_get_drvdata(pdev);
 
        asic3_set_register(asic, ASIC3_OFFSET(EXTCF, SELECT),
@@ -1038,9 +1036,8 @@ static int asic3_remove(struct platform_device *pdev)
 
        asic3_mfd_remove(pdev);
 
-       ret = asic3_gpio_remove(pdev);
-       if (ret < 0)
-               return ret;
+       asic3_gpio_remove(pdev);
+
        asic3_irq_remove(pdev);
 
        asic3_write_register(asic, ASIC3_OFFSET(CLOCK, SEL), 0);