nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

gpio: ml-ioh: use resource management for irqs

Browse source 
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>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Bartosz Golaszewski 2017-03-04 17:23:33 +01:00 committed by Linus Walleij
parent f57f3e6003
commit e971ac9a56
1 changed files with 7 additions and 21 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

28
drivers/gpio/gpio-ml-ioh.c
View file

@ -459,41 +459,31 @@ static int ioh_gpio_probe(struct pci_dev *pdev,
chip = chip_save; chip = chip_save;
for (j = 0; j < 8; j++, chip++) { for (j = 0; j < 8; j++, chip++) {
irq_base = irq_alloc_descs(-1, IOH_IRQ_BASE, num_ports[j], irq_base = devm_irq_alloc_descs(&pdev->dev, -1, IOH_IRQ_BASE,
NUMA_NO_NODE); num_ports[j], NUMA_NO_NODE);
if (irq_base < 0) { if (irq_base < 0) {
dev_warn(&pdev->dev, dev_warn(&pdev->dev,
"ml_ioh_gpio: Failed to get IRQ base num\n"); "ml_ioh_gpio: Failed to get IRQ base num\n");
chip->irq_base = -1;
ret = irq_base; ret = irq_base;
goto err_irq_alloc_descs; goto err_gpiochip_add;
} }
chip->irq_base = irq_base; chip->irq_base = irq_base;
ioh_gpio_alloc_generic_chip(chip, irq_base, num_ports[j]); ioh_gpio_alloc_generic_chip(chip, irq_base, num_ports[j]);
} }
chip = chip_save; chip = chip_save;
ret = request_irq(pdev->irq, ioh_gpio_handler, ret = devm_request_irq(&pdev->dev, pdev->irq, ioh_gpio_handler,
IRQF_SHARED, KBUILD_MODNAME, chip); IRQF_SHARED, KBUILD_MODNAME, chip);
if (ret != 0) { if (ret != 0) {
dev_err(&pdev->dev, dev_err(&pdev->dev,
"%s request_irq failed\n", __func__); "%s request_irq failed\n", __func__);
goto err_request_irq; goto err_gpiochip_add;
} }
pci_set_drvdata(pdev, chip); pci_set_drvdata(pdev, chip);
return 0; return 0;
err_request_irq:
chip = chip_save;
err_irq_alloc_descs:
while (--j >= 0) {
chip--;
irq_free_descs(chip->irq_base, num_ports[j]);
}
chip = chip_save;
err_gpiochip_add: err_gpiochip_add:
while (--i >= 0) { while (--i >= 0) {
chip--; chip--;
@ -524,12 +514,8 @@ static void ioh_gpio_remove(struct pci_dev *pdev)
chip_save = chip; chip_save = chip;
free_irq(pdev->irq, chip); for (i = 0; i < 8; i++, chip++)
for (i = 0; i < 8; i++, chip++) {
irq_free_descs(chip->irq_base, num_ports[i]);
gpiochip_remove(&chip->gpio); gpiochip_remove(&chip->gpio);
}
chip = chip_save; chip = chip_save;
pci_iounmap(pdev, chip->base); pci_iounmap(pdev, chip->base);