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

Groups > linux.kernel > #1592571

[PATCH 11/12] gpio: mxs: use devm_irq_alloc_descs()

Show all headers | View raw

This driver never frees the interrupt descriptors it allocates. Fix
it by using the resource managed version of irq_alloc_descs().

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

diff --git a/drivers/gpio/gpio-mxs.c b/drivers/gpio/gpio-mxs.c
index 2292742..6ae583f 100644
--- a/drivers/gpio/gpio-mxs.c
+++ b/drivers/gpio/gpio-mxs.c
@@ -328,7 +328,7 @@ static int mxs_gpio_probe(struct platform_device *pdev)
 	/* clear address has to be used to clear IRQSTAT bits */
 	writel(~0U, port->base + PINCTRL_IRQSTAT(port) + MXS_CLR);
 
-	irq_base = irq_alloc_descs(-1, 0, 32, numa_node_id());
+	irq_base = devm_irq_alloc_descs(&pdev->dev, -1, 0, 32, numa_node_id());
 	if (irq_base < 0) {
 		err = irq_base;
 		goto out_iounmap;
@@ -338,7 +338,7 @@ static int mxs_gpio_probe(struct platform_device *pdev)
 					     &irq_domain_simple_ops, NULL);
 	if (!port->domain) {
 		err = -ENODEV;
-		goto out_irqdesc_free;
+		goto out_iounmap;
 	}
 
 	/* gpio-mxs can be a generic irq chip */
@@ -370,8 +370,6 @@ static int mxs_gpio_probe(struct platform_device *pdev)
 
 out_irqdomain_remove:
 	irq_domain_remove(port->domain);
-out_irqdesc_free:
-	irq_free_descs(irq_base, 32);
 out_iounmap:
 	iounmap(port->base);
 	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