diff options
| author | William Breathitt Gray <vilhelm.gray@gmail.com> | 2017-01-24 21:01:04 +0100 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2017-01-26 15:55:25 +0100 |
| commit | 2141b0a1d718d5f75b581530ef4f9641c7c4284c (patch) | |
| tree | e786bb3b31a47c83ab14d0ebd82db5cf9dfd3b50 /drivers/gpio | |
| parent | gpio: 104-idio-16: Utilize devm_ functions in driver probe callback (diff) | |
| download | linux-2141b0a1d718d5f75b581530ef4f9641c7c4284c.tar.xz linux-2141b0a1d718d5f75b581530ef4f9641c7c4284c.zip | |
gpio: gpio-mm: Utilize devm_ functions in driver probe callback
The devm_ resource manager functions allow memory to be automatically
released when a device is unbound. This patch takes advantage of the
resource manager functions and replaces the gpiochip_add_data call with
the devm_gpiochip_add_data call. In addition, the gpiomm_remove function
has been removed as no longer necessary due to the use of the relevant
devm_ resource manager functions.
Signed-off-by: William Breathitt Gray <vilhelm.gray@gmail.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/gpio')
| -rw-r--r-- | drivers/gpio/gpio-gpio-mm.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/drivers/gpio/gpio-gpio-mm.c b/drivers/gpio/gpio-gpio-mm.c index 093489556c54..393c8f9cf30d 100644 --- a/drivers/gpio/gpio-gpio-mm.c +++ b/drivers/gpio/gpio-gpio-mm.c @@ -263,7 +263,7 @@ static int gpiomm_probe(struct device *dev, unsigned int id) dev_set_drvdata(dev, gpiommgpio); - err = gpiochip_add_data(&gpiommgpio->chip, gpiommgpio); + err = devm_gpiochip_add_data(dev, &gpiommgpio->chip, gpiommgpio); if (err) { dev_err(dev, "GPIO registering failed (%d)\n", err); return err; @@ -282,21 +282,11 @@ static int gpiomm_probe(struct device *dev, unsigned int id) return 0; } -static int gpiomm_remove(struct device *dev, unsigned int id) -{ - struct gpiomm_gpio *const gpiommgpio = dev_get_drvdata(dev); - - gpiochip_remove(&gpiommgpio->chip); - - return 0; -} - static struct isa_driver gpiomm_driver = { .probe = gpiomm_probe, .driver = { .name = "gpio-mm" }, - .remove = gpiomm_remove }; module_isa_driver(gpiomm_driver, num_gpiomm); |