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

Groups > linux.kernel > #1592563

[PATCH 12/12] gpio: sta2x11: use resource management for irqs

Show all headers | View raw

Use device resource managed variants of irq_alloc_descs() and
request_irq() and remove the code manually freeing irq resources.

Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
---
 drivers/gpio/gpio-sta2x11.c | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/drivers/gpio/gpio-sta2x11.c b/drivers/gpio/gpio-sta2x11.c
index 853ca23..39df062 100644
--- a/drivers/gpio/gpio-sta2x11.c
+++ b/drivers/gpio/gpio-sta2x11.c
@@ -392,7 +392,8 @@ static int gsta_probe(struct platform_device *dev)
 			gsta_set_config(chip, i, gpio_pdata->pinconfig[i]);
 
 	/* 384 was used in previous code: be compatible for other drivers */
-	err = irq_alloc_descs(-1, 384, GSTA_NR_GPIO, NUMA_NO_NODE);
+	err = devm_irq_alloc_descs(&dev->dev, -1, 384,
+				   GSTA_NR_GPIO, NUMA_NO_NODE);
 	if (err < 0) {
 		dev_warn(&dev->dev, "sta2x11 gpio: Can't get irq base (%i)\n",
 			 -err);
@@ -401,29 +402,23 @@ static int gsta_probe(struct platform_device *dev)
 	chip->irq_base = err;
 	gsta_alloc_irq_chip(chip);
 
-	err = request_irq(pdev->irq, gsta_gpio_handler,
-			     IRQF_SHARED, KBUILD_MODNAME, chip);
+	err = devm_request_irq(&dev->dev, pdev->irq, gsta_gpio_handler,
+			       IRQF_SHARED, KBUILD_MODNAME, chip);
 	if (err < 0) {
 		dev_err(&dev->dev, "sta2x11 gpio: Can't request irq (%i)\n",
 			-err);
-		goto err_free_descs;
+		return err;
 	}
 
 	err = devm_gpiochip_add_data(&dev->dev, &chip->gpio, chip);
 	if (err < 0) {
 		dev_err(&dev->dev, "sta2x11 gpio: Can't register (%i)\n",
 			-err);
-		goto err_free_irq;
+		return err;
 	}
 
 	platform_set_drvdata(dev, chip);
 	return 0;
-
-err_free_irq:
-	free_irq(pdev->irq, chip);
-err_free_descs:
-	irq_free_descs(chip->irq_base, GSTA_NR_GPIO);
-	return err;
 }
 
 static struct platform_driver sta2x11_gpio_platform_driver = {
-- 
2.9.3

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

Thread

[PATCH 00/12] gpio: use resource management for irq descriptors Bartosz Golaszewski <bgolaszewski@baylibre.com> - 2017-03-04 17:40 +0100
  [PATCH 12/12] gpio: sta2x11: use resource management for irqs Bartosz Golaszewski <bgolaszewski@baylibre.com> - 2017-03-04 17:40 +0100
  [PATCH 07/12] gpio: pxa: use devm_irq_alloc_descs() Bartosz Golaszewski <bgolaszewski@baylibre.com> - 2017-03-04 17:40 +0100
    Re: [PATCH 07/12] gpio: pxa: use devm_irq_alloc_descs() Robert Jarzmik <robert.jarzmik@free.fr> - 2017-03-04 21:40 +0100
  [PATCH 05/12] gpio: ml-ioh: use resource management for irqs Bartosz Golaszewski <bgolaszewski@baylibre.com> - 2017-03-04 17:40 +0100
  [PATCH 08/12] gpio: davinci: use devm_irq_alloc_descs() Bartosz Golaszewski <bgolaszewski@baylibre.com> - 2017-03-04 17:40 +0100
    Re: [PATCH 08/12] gpio: davinci: use devm_irq_alloc_descs() Keerthy <j-keerthy@ti.com> - 2017-03-06 06:10 +0100
  [PATCH 04/12] gpio: pch: use resource management for irqs Bartosz Golaszewski <bgolaszewski@baylibre.com> - 2017-03-04 17:40 +0100
  [PATCH 01/12] gpio: mockup: use devm_irq_alloc_descs() Bartosz Golaszewski <bgolaszewski@baylibre.com> - 2017-03-04 17:40 +0100
    Re: [PATCH 01/12] gpio: mockup: use devm_irq_alloc_descs() Bamvor Zhang Jian <bamvor.zhangjian@linaro.org> - 2017-03-08 09:30 +0100
  [PATCH 09/12] gpio: sodaville: use resource management for irqs Bartosz Golaszewski <bgolaszewski@baylibre.com> - 2017-03-04 17:40 +0100
  [PATCH 11/12] gpio: mxs: use devm_irq_alloc_descs() Bartosz Golaszewski <bgolaszewski@baylibre.com> - 2017-03-04 17:40 +0100
  [PATCH 02/12] gpio: twl4030: use devm_irq_alloc_descs() Bartosz Golaszewski <bgolaszewski@baylibre.com> - 2017-03-04 17:40 +0100
  [PATCH 06/12] gpio: xlp: use resource management for irqs Bartosz Golaszewski <bgolaszewski@baylibre.com> - 2017-03-04 17:40 +0100
  [PATCH 03/12] gpio: omap: use devm_irq_alloc_descs() Bartosz Golaszewski <bgolaszewski@baylibre.com> - 2017-03-04 18:00 +0100
    Re: [PATCH 03/12] gpio: omap: use devm_irq_alloc_descs() Tony Lindgren <tony@atomide.com> - 2017-03-06 18:00 +0100
  [PATCH 10/12] gpio: mxc: use devm_irq_alloc_descs() Bartosz Golaszewski <bgolaszewski@baylibre.com> - 2017-03-04 19:30 +0100

csiph-web