Merge tag 'xfs-for-linus-4.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[karo-tx-linux.git] / drivers / gpio / gpio-twl6040.c

diff --git a/drivers/gpio/gpio-twl6040.c b/drivers/gpio/gpio-twl6040.c
index 8e9e9853f3bd4c9f92985a650dc07452bb0b72bd..b780314cdfc9a048c91db99922feb25bb15fe5ac 100644 (file)
--- a/drivers/gpio/gpio-twl6040.c
+++ b/drivers/gpio/gpio-twl6040.c
@@ -100,7 +100,7 @@ static int gpo_twl6040_probe(struct platform_device *pdev)
        twl6040gpo_chip.of_node = twl6040_core_dev->of_node;
 #endif
 
-       ret = gpiochip_add_data(&twl6040gpo_chip, NULL);
+       ret = devm_gpiochip_add_data(&pdev->dev, &twl6040gpo_chip, NULL);
        if (ret < 0) {
                dev_err(&pdev->dev, "could not register gpiochip, %d\n", ret);
                twl6040gpo_chip.ngpio = 0;
@@ -109,12 +109,6 @@ static int gpo_twl6040_probe(struct platform_device *pdev)
        return ret;
 }
 
-static int gpo_twl6040_remove(struct platform_device *pdev)
-{
-       gpiochip_remove(&twl6040gpo_chip);
-       return 0;
-}
-
 /* Note:  this hardware lives inside an I2C-based multi-function device. */
 MODULE_ALIAS("platform:twl6040-gpo");
 
@@ -123,7 +117,6 @@ static struct platform_driver gpo_twl6040_driver = {
                .name   = "twl6040-gpo",
        },
        .probe          = gpo_twl6040_probe,
-       .remove         = gpo_twl6040_remove,
 };
 
 module_platform_driver(gpo_twl6040_driver);