hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

gpio: sodaville: 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: 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:37 +01:00 committed by Linus Walleij
parent a1a3c2d551
commit 74dd9ebfff
1 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/gpio/gpio-sodaville.c
View File

@ -135,7 +135,8 @@ static int sdv_register_irqsupport(struct sdv_gpio_chip_data *sd,
struct irq_chip_type *ct; struct irq_chip_type *ct;
int ret; int ret;
sd->irq_base = irq_alloc_descs(-1, 0, SDV_NUM_PUB_GPIOS, -1); sd->irq_base = devm_irq_alloc_descs(&pdev->dev, -1, 0,
SDV_NUM_PUB_GPIOS, -1);
if (sd->irq_base < 0) if (sd->irq_base < 0)
return sd->irq_base; return sd->irq_base;
@ -143,10 +144,11 @@ static int sdv_register_irqsupport(struct sdv_gpio_chip_data *sd,
writel(0, sd->gpio_pub_base + GPIO_INT); writel(0, sd->gpio_pub_base + GPIO_INT);
writel((1 << 11) - 1, sd->gpio_pub_base + GPSTR); writel((1 << 11) - 1, sd->gpio_pub_base + GPSTR);
ret = request_irq(pdev->irq, sdv_gpio_pub_irq_handler, IRQF_SHARED, ret = devm_request_irq(&pdev->dev, pdev->irq,
"sdv_gpio", sd); sdv_gpio_pub_irq_handler, IRQF_SHARED,
"sdv_gpio", sd);
if (ret) if (ret)
goto out_free_desc; return ret;
/* /*
* This gpio irq controller latches level irqs. Testing shows that if * This gpio irq controller latches level irqs. Testing shows that if
@ -155,10 +157,8 @@ static int sdv_register_irqsupport(struct sdv_gpio_chip_data *sd,
*/ */
sd->gc = irq_alloc_generic_chip("sdv-gpio", 1, sd->irq_base, sd->gc = irq_alloc_generic_chip("sdv-gpio", 1, sd->irq_base,
sd->gpio_pub_base, handle_fasteoi_irq); sd->gpio_pub_base, handle_fasteoi_irq);
if (!sd->gc) { if (!sd->gc)
ret = -ENOMEM; return -ENOMEM;
goto out_free_irq;
}
sd->gc->private = sd; sd->gc->private = sd;
ct = sd->gc->chip_types; ct = sd->gc->chip_types;
@ -176,16 +176,10 @@ static int sdv_register_irqsupport(struct sdv_gpio_chip_data *sd,
sd->id = irq_domain_add_legacy(pdev->dev.of_node, SDV_NUM_PUB_GPIOS, sd->id = irq_domain_add_legacy(pdev->dev.of_node, SDV_NUM_PUB_GPIOS,
sd->irq_base, 0, &irq_domain_sdv_ops, sd); sd->irq_base, 0, &irq_domain_sdv_ops, sd);
if (!sd->id) { if (!sd->id)
ret = -ENODEV; return -ENODEV;
goto out_free_irq;
}
return 0; return 0;
out_free_irq:
free_irq(pdev->irq, sd);
out_free_desc:
irq_free_descs(sd->irq_base, SDV_NUM_PUB_GPIOS);
return ret;
} }
static int sdv_gpio_probe(struct pci_dev *pdev, static int sdv_gpio_probe(struct pci_dev *pdev,