forked from Minki/linux
gpio: xlp: use resource management for irqs
Use the resource managed variant of irq_alloc_descs() and remove the code manually freeing allocated interrupt descriptors. Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
parent
e971ac9a56
commit
31bd86d983
@ -404,7 +404,9 @@ static int xlp_gpio_probe(struct platform_device *pdev)
|
||||
|
||||
/* XLP(MIPS) has fixed range for GPIO IRQs, Vulcan(ARM64) does not */
|
||||
if (soc_type != GPIO_VARIANT_VULCAN) {
|
||||
irq_base = irq_alloc_descs(-1, XLP_GPIO_IRQ_BASE, gc->ngpio, 0);
|
||||
irq_base = devm_irq_alloc_descs(&pdev->dev, -1,
|
||||
XLP_GPIO_IRQ_BASE,
|
||||
gc->ngpio, 0);
|
||||
if (irq_base < 0) {
|
||||
dev_err(&pdev->dev, "Failed to allocate IRQ numbers\n");
|
||||
return irq_base;
|
||||
@ -415,7 +417,7 @@ static int xlp_gpio_probe(struct platform_device *pdev)
|
||||
|
||||
err = gpiochip_add_data(gc, priv);
|
||||
if (err < 0)
|
||||
goto out_free_desc;
|
||||
return err;
|
||||
|
||||
err = gpiochip_irqchip_add(gc, &xlp_gpio_irq_chip, irq_base,
|
||||
handle_level_irq, IRQ_TYPE_NONE);
|
||||
@ -433,8 +435,6 @@ static int xlp_gpio_probe(struct platform_device *pdev)
|
||||
|
||||
out_gpio_remove:
|
||||
gpiochip_remove(gc);
|
||||
out_free_desc:
|
||||
irq_free_descs(irq_base, gc->ngpio);
|
||||
return err;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user