Merge tag 'usb-4.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

[cascardo/linux.git] / drivers / gpio / gpio-rdc321x.c

diff --git a/drivers/gpio/gpio-rdc321x.c b/drivers/gpio/gpio-rdc321x.c
index 96ddee3..ec945b9 100644 (file)
--- a/drivers/gpio/gpio-rdc321x.c
+++ b/drivers/gpio/gpio-rdc321x.c
@@ -194,23 +194,14 @@ static int rdc321x_gpio_probe(struct platform_device *pdev)
 
        dev_info(&pdev->dev, "registering %d GPIOs\n",
                                        rdc321x_gpio_dev->chip.ngpio);
-       return gpiochip_add_data(&rdc321x_gpio_dev->chip, rdc321x_gpio_dev);
-}
-
-static int rdc321x_gpio_remove(struct platform_device *pdev)
-{
-       struct rdc321x_gpio *rdc321x_gpio_dev = platform_get_drvdata(pdev);
-
-       gpiochip_remove(&rdc321x_gpio_dev->chip);
-
-       return 0;
+       return devm_gpiochip_add_data(&pdev->dev, &rdc321x_gpio_dev->chip,
+                                     rdc321x_gpio_dev);
 }
 
 static struct platform_driver rdc321x_gpio_driver = {
        .driver.name    = "rdc321x-gpio",
        .driver.owner   = THIS_MODULE,
        .probe          = rdc321x_gpio_probe,
-       .remove         = rdc321x_gpio_remove,
 };
 
 module_platform_driver(rdc321x_gpio_driver);