Merge branch 'for-4.6/core' of git://git.kernel.dk/linux-block

[linux-2.6-block.git] / drivers / gpio / gpio-syscon.c

diff --git a/drivers/gpio/gpio-syscon.c b/drivers/gpio/gpio-syscon.c
index e5c5b62058863a60b36cf7aa38e0e865b29daafb..24b6d643ecdbf82188a7c136420ec6e074a9403b 100644 (file)
--- a/drivers/gpio/gpio-syscon.c
+++ b/drivers/gpio/gpio-syscon.c
@@ -238,15 +238,7 @@ static int syscon_gpio_probe(struct platform_device *pdev)
 
        platform_set_drvdata(pdev, priv);
 
-       return gpiochip_add_data(&priv->chip, priv);
-}
-
-static int syscon_gpio_remove(struct platform_device *pdev)
-{
-       struct syscon_gpio_priv *priv = platform_get_drvdata(pdev);
-
-       gpiochip_remove(&priv->chip);
-       return 0;
+       return devm_gpiochip_add_data(&pdev->dev, &priv->chip, priv);
 }
 
 static struct platform_driver syscon_gpio_driver = {
@@ -255,7 +247,6 @@ static struct platform_driver syscon_gpio_driver = {
                .of_match_table = syscon_gpio_ids,
        },
        .probe  = syscon_gpio_probe,
-       .remove = syscon_gpio_remove,
 };
 module_platform_driver(syscon_gpio_driver);