diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2016-03-08 14:41:41 +0700 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2016-03-08 14:41:41 +0700 |
| commit | 016bf20829fa00f5e64805f77b7677365151f4af (patch) | |
| tree | 5ef012a06aaa59e7ee5bbed984322f0a97c37309 /drivers/gpio/gpio-kempld.c | |
| parent | a961f9b472de93e770d53b7340a58dbff64b4075 (diff) | |
| parent | 725e3b7d40dffa10dbe0a24ba70676a3127f79fc (diff) | |
Merge branch 'devm-gpiochip-add-data' into devel
Diffstat (limited to 'drivers/gpio/gpio-kempld.c')
| -rw-r--r-- | drivers/gpio/gpio-kempld.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/drivers/gpio/gpio-kempld.c b/drivers/gpio/gpio-kempld.c index 01117747b965..701f1510328c 100644 --- a/drivers/gpio/gpio-kempld.c +++ b/drivers/gpio/gpio-kempld.c @@ -178,7 +178,7 @@ static int kempld_gpio_probe(struct platform_device *pdev) return -ENODEV; } - ret = gpiochip_add_data(chip, gpio); + ret = devm_gpiochip_add_data(dev, chip, gpio); if (ret) { dev_err(dev, "Could not register GPIO chip\n"); return ret; @@ -190,20 +190,11 @@ static int kempld_gpio_probe(struct platform_device *pdev) return 0; } -static int kempld_gpio_remove(struct platform_device *pdev) -{ - struct kempld_gpio_data *gpio = platform_get_drvdata(pdev); - - gpiochip_remove(&gpio->chip); - return 0; -} - static struct platform_driver kempld_gpio_driver = { .driver = { .name = "kempld-gpio", }, .probe = kempld_gpio_probe, - .remove = kempld_gpio_remove, }; module_platform_driver(kempld_gpio_driver); |