Commit f57f3e60 authored by Bartosz Golaszewski's avatar Bartosz Golaszewski Committed by Linus Walleij
Browse files

gpio: pch: use resource management for irqs 



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

Signed-off-by: default avatarBartosz Golaszewski <bgolaszewski@baylibre.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 2ed36f30

drivers/gpio/gpio-pch.c

+4 −10
Original line number Diff line number Diff line
@@ -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,7 +417,7 @@ 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,

	ret = devm_request_irq(&pdev->dev, pdev->irq, pch_gpio_handler,

			       IRQF_SHARED, KBUILD_MODNAME, chip);

	if (ret != 0) {

		dev_err(&pdev->dev,
@@ -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);