Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1566110

[PATCH 4/5] gpio: gpio-mm: Utilize devm_ functions in driver probe callback

Show all headers | View raw

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>
---
 drivers/gpio/gpio-gpio-mm.c | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/drivers/gpio/gpio-gpio-mm.c b/drivers/gpio/gpio-gpio-mm.c
index 1e7def9449ce..c2837ce64ea3 100644
--- a/drivers/gpio/gpio-gpio-mm.c
+++ b/drivers/gpio/gpio-gpio-mm.c
@@ -224,7 +224,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;
@@ -243,21 +243,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);
-- 
2.11.0

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 0/5] gpio: Utilize devm_ functions in driver probe callbacks William Breathitt Gray <vilhelm.gray@gmail.com> - 2017-01-24 21:10 +0100
  [PATCH 5/5] gpio: ws16c48: Utilize devm_ functions in driver probe callback William Breathitt Gray <vilhelm.gray@gmail.com> - 2017-01-24 21:10 +0100
    Re: [PATCH 5/5] gpio: ws16c48: Utilize devm_ functions in driver  probe callback Linus Walleij <linus.walleij@linaro.org> - 2017-01-26 16:00 +0100
  [PATCH 4/5] gpio: gpio-mm: Utilize devm_ functions in driver probe callback William Breathitt Gray <vilhelm.gray@gmail.com> - 2017-01-24 21:10 +0100
    Re: [PATCH 4/5] gpio: gpio-mm: Utilize devm_ functions in driver  probe callback Linus Walleij <linus.walleij@linaro.org> - 2017-01-26 16:00 +0100
  [PATCH 3/5] gpio: 104-idio-16: Utilize devm_ functions in driver probe callback William Breathitt Gray <vilhelm.gray@gmail.com> - 2017-01-24 21:10 +0100
    Re: [PATCH 3/5] gpio: 104-idio-16: Utilize devm_ functions in driver  probe callback Linus Walleij <linus.walleij@linaro.org> - 2017-01-26 16:00 +0100
  [PATCH 1/5] gpio: 104-dio-48e: Utilize devm_ functions in driver probe callback William Breathitt Gray <vilhelm.gray@gmail.com> - 2017-01-24 21:10 +0100
    Re: [PATCH 1/5] gpio: 104-dio-48e: Utilize devm_ functions in driver  probe callback Linus Walleij <linus.walleij@linaro.org> - 2017-01-26 16:00 +0100

csiph-web