diff options
| author | Laxman Dewangan | 2016-02-22 13:13:28 +0100 |
|---|---|---|
| committer | Laxman Dewangan | 2016-02-23 16:05:28 +0100 |
| commit | 85bd84f5360908b9093ab06750e5b1006222da31 (patch) | |
| tree | 2189bb6675816b965ba5448a9c401bd406e32af9 /drivers/gpio | |
| parent | gpio: crystalcove: Use devm_gpiochip_add_data() for gpio registration (diff) | |
| download | kernel-qcow2-linux-85bd84f5360908b9093ab06750e5b1006222da31.tar.gz kernel-qcow2-linux-85bd84f5360908b9093ab06750e5b1006222da31.tar.xz kernel-qcow2-linux-85bd84f5360908b9093ab06750e5b1006222da31.zip | |
gpio: cs5535: Use devm_gpiochip_add_data() for gpio registration
Use devm_gpiochip_add_data() for GPIO registration and remove the
need of driver callback .remove.
Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Diffstat (limited to 'drivers/gpio')
| -rw-r--r-- | drivers/gpio/gpio-cs5535.c | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/drivers/gpio/gpio-cs5535.c b/drivers/gpio/gpio-cs5535.c index eccb712e09fb..90278b19aa0e 100644 --- a/drivers/gpio/gpio-cs5535.c +++ b/drivers/gpio/gpio-cs5535.c @@ -320,13 +320,13 @@ static int cs5535_gpio_probe(struct platform_device *pdev) res = platform_get_resource(pdev, IORESOURCE_IO, 0); if (!res) { dev_err(&pdev->dev, "can't fetch device resource info\n"); - goto done; + return err; } if (!devm_request_region(&pdev->dev, res->start, resource_size(res), pdev->name)) { dev_err(&pdev->dev, "can't request region\n"); - goto done; + return err; } /* set up the driver-specific struct */ @@ -348,19 +348,10 @@ static int cs5535_gpio_probe(struct platform_device *pdev) mask_orig, mask); /* finally, register with the generic GPIO API */ - err = gpiochip_add_data(&cs5535_gpio_chip.chip, &cs5535_gpio_chip); + err = devm_gpiochip_add_data(&pdev->dev, &cs5535_gpio_chip.chip, + &cs5535_gpio_chip); if (err) - goto done; - - return 0; - -done: - return err; -} - -static int cs5535_gpio_remove(struct platform_device *pdev) -{ - gpiochip_remove(&cs5535_gpio_chip.chip); + return err; return 0; } @@ -370,7 +361,6 @@ static struct platform_driver cs5535_gpio_driver = { .name = DRV_NAME, }, .probe = cs5535_gpio_probe, - .remove = cs5535_gpio_remove, }; module_platform_driver(cs5535_gpio_driver); |