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

Groups > linux.kernel > #1592573

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

Show all headers | View raw

Use the resource managed variant of irq_alloc_descs() and remove the
code manually freeing allocated interrupt descriptors.

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

diff --git a/drivers/gpio/gpio-xlp.c b/drivers/gpio/gpio-xlp.c
index 4620d05..7cc82cf 100644
--- a/drivers/gpio/gpio-xlp.c
+++ b/drivers/gpio/gpio-xlp.c
@@ -404,7 +404,9 @@ static int xlp_gpio_probe(struct platform_device *pdev)
 
 	/* XLP(MIPS) has fixed range for GPIO IRQs, Vulcan(ARM64) does not */
 	if (soc_type != GPIO_VARIANT_VULCAN) {
-		irq_base = irq_alloc_descs(-1, XLP_GPIO_IRQ_BASE, gc->ngpio, 0);
+		irq_base = devm_irq_alloc_descs(&pdev->dev, -1,
+						XLP_GPIO_IRQ_BASE,
+						gc->ngpio, 0);
 		if (irq_base < 0) {
 			dev_err(&pdev->dev, "Failed to allocate IRQ numbers\n");
 			return irq_base;
@@ -415,7 +417,7 @@ static int xlp_gpio_probe(struct platform_device *pdev)
 
 	err = gpiochip_add_data(gc, priv);
 	if (err < 0)
-		goto out_free_desc;
+		return err;
 
 	err = gpiochip_irqchip_add(gc, &xlp_gpio_irq_chip, irq_base,
 				handle_level_irq, IRQ_TYPE_NONE);
@@ -433,8 +435,6 @@ static int xlp_gpio_probe(struct platform_device *pdev)
 
 out_gpio_remove:
 	gpiochip_remove(gc);
-out_free_desc:
-	irq_free_descs(irq_base, gc->ngpio);
 	return err;
 }
 
-- 
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