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

Groups > linux.kernel > #1592568

[PATCH 04/12] gpio: pch: 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-pch.c | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/drivers/gpio/gpio-pch.c b/drivers/gpio/gpio-pch.c
index 7c7135d..71bc6da 100644
--- a/drivers/gpio/gpio-pch.c
+++ b/drivers/gpio/gpio-pch.c
@@ -403,7 +403,8 @@ static int pch_gpio_probe(struct pci_dev *pdev,
 		goto err_gpiochip_add;
 	}
 
-	irq_base = irq_alloc_descs(-1, 0, gpio_pins[chip->ioh], NUMA_NO_NODE);
+	irq_base = devm_irq_alloc_descs(&pdev->dev, -1, 0,
+					gpio_pins[chip->ioh], NUMA_NO_NODE);
 	if (irq_base < 0) {
 		dev_warn(&pdev->dev, "PCH gpio: Failed to get IRQ base num\n");
 		chip->irq_base = -1;
@@ -416,8 +417,8 @@ static int pch_gpio_probe(struct pci_dev *pdev,
 	iowrite32(msk, &chip->reg->imask);
 	iowrite32(msk, &chip->reg->ien);
 
-	ret = request_irq(pdev->irq, pch_gpio_handler,
-			  IRQF_SHARED, KBUILD_MODNAME, chip);
+	ret = devm_request_irq(&pdev->dev, pdev->irq, pch_gpio_handler,
+			       IRQF_SHARED, KBUILD_MODNAME, chip);
 	if (ret != 0) {
 		dev_err(&pdev->dev,
 			"%s request_irq failed\n", __func__);
@@ -430,7 +431,6 @@ static int pch_gpio_probe(struct pci_dev *pdev,
 	return 0;
 
 err_request_irq:
-	irq_free_descs(irq_base, gpio_pins[chip->ioh]);
 	gpiochip_remove(&chip->gpio);
 
 err_gpiochip_add:
@@ -452,12 +452,6 @@ static void pch_gpio_remove(struct pci_dev *pdev)
 {
 	struct pch_gpio *chip = pci_get_drvdata(pdev);
 
-	if (chip->irq_base != -1) {
-		free_irq(pdev->irq, chip);
-
-		irq_free_descs(chip->irq_base, gpio_pins[chip->ioh]);
-	}
-
 	gpiochip_remove(&chip->gpio);
 	pci_iounmap(pdev, chip->base);
 	pci_release_regions(pdev);
-- 
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