gpio: xgs-iproc: Convert to platform remove callback returning void

[linux-2.6-microblaze.git] / drivers / gpio / gpio-xgs-iproc.c

diff --git a/drivers/gpio/gpio-xgs-iproc.c b/drivers/gpio/gpio-xgs-iproc.c
index 2d23b27..d445eea 100644 (file)
--- a/drivers/gpio/gpio-xgs-iproc.c
+++ b/drivers/gpio/gpio-xgs-iproc.c
@@ -291,7 +291,7 @@ static int iproc_gpio_probe(struct platform_device *pdev)
        return 0;
 }
 
-static int iproc_gpio_remove(struct platform_device *pdev)
+static void iproc_gpio_remove(struct platform_device *pdev)
 {
        struct iproc_gpio_chip *chip = platform_get_drvdata(pdev);
 
@@ -302,8 +302,6 @@ static int iproc_gpio_remove(struct platform_device *pdev)
                val &= ~IPROC_CCA_INT_F_GPIOINT;
                writel_relaxed(val, chip->intr + IPROC_CCA_INT_MASK);
        }
-
-       return 0;
 }
 
 static const struct of_device_id bcm_iproc_gpio_of_match[] = {
@@ -318,7 +316,7 @@ static struct platform_driver bcm_iproc_gpio_driver = {
                .of_match_table = bcm_iproc_gpio_of_match,
        },
        .probe = iproc_gpio_probe,
-       .remove = iproc_gpio_remove,
+       .remove_new = iproc_gpio_remove,
 };
 
 module_platform_driver(bcm_iproc_gpio_driver);