Merge tag 'pm+acpi-4.6-rc1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...

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

diff --git a/drivers/gpio/gpio-rc5t583.c b/drivers/gpio/gpio-rc5t583.c
index 1e2d210b33697d55aa75cfe40871a0ddd244752b..1d6100fa312ad94b456d9276f570e024782fa505 100644 (file)
--- a/drivers/gpio/gpio-rc5t583.c
+++ b/drivers/gpio/gpio-rc5t583.c
@@ -136,15 +136,8 @@ static int rc5t583_gpio_probe(struct platform_device *pdev)
 
        platform_set_drvdata(pdev, rc5t583_gpio);
 
-       return gpiochip_add_data(&rc5t583_gpio->gpio_chip, rc5t583_gpio);
-}
-
-static int rc5t583_gpio_remove(struct platform_device *pdev)
-{
-       struct rc5t583_gpio *rc5t583_gpio = platform_get_drvdata(pdev);
-
-       gpiochip_remove(&rc5t583_gpio->gpio_chip);
-       return 0;
+       return devm_gpiochip_add_data(&pdev->dev, &rc5t583_gpio->gpio_chip,
+                                     rc5t583_gpio);
 }
 
 static struct platform_driver rc5t583_gpio_driver = {
@@ -152,7 +145,6 @@ static struct platform_driver rc5t583_gpio_driver = {
                .name    = "rc5t583-gpio",
        },
        .probe          = rc5t583_gpio_probe,
-       .remove         = rc5t583_gpio_remove,
 };
 
 static int __init rc5t583_gpio_init(void)