diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2016-02-25 14:22:10 +0100 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2016-02-25 14:22:10 +0100 |
| commit | 725e3b7d40dffa10dbe0a24ba70676a3127f79fc (patch) | |
| tree | 3b4cfc0973de0f6459a5a340c997a78ae1dfcdb1 /drivers/gpio/gpio-rdc321x.c | |
| parent | gpio: pisosr: Use devm_gpiod_get_optional for gpio->load_gpio (diff) | |
| parent | gpio: xgene: Use devm_gpiochip_add_data() for gpio registration (diff) | |
| download | linux-725e3b7d40dffa10dbe0a24ba70676a3127f79fc.tar.xz linux-725e3b7d40dffa10dbe0a24ba70676a3127f79fc.zip | |
Merge branch 'devm_gpiochip' of https://github.com/ldewangan/linux-upstream into devm-gpiochip-add-data
Diffstat (limited to 'drivers/gpio/gpio-rdc321x.c')
| -rw-r--r-- | drivers/gpio/gpio-rdc321x.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/drivers/gpio/gpio-rdc321x.c b/drivers/gpio/gpio-rdc321x.c index 96ddee3f464a..ec945b90f54d 100644 --- 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); |