Merge branch 'misc.poll' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[sfrench/cifs-2.6.git] / drivers / gpio / gpio-ml-ioh.c

diff --git a/drivers/gpio/gpio-ml-ioh.c b/drivers/gpio/gpio-ml-ioh.c
index 74fdce096c26eddd57982bd455f56a26d0036219..4b80e996d976524398e6ad484dd2f552bcdbed65 100644 (file)
--- a/drivers/gpio/gpio-ml-ioh.c
+++ b/drivers/gpio/gpio-ml-ioh.c
@@ -391,9 +391,10 @@ static int ioh_gpio_alloc_generic_chip(struct ioh_gpio *chip,
 {
        struct irq_chip_generic *gc;
        struct irq_chip_type *ct;
+       int rv;
 
-       gc = irq_alloc_generic_chip("ioh_gpio", 1, irq_start, chip->base,
-                                   handle_simple_irq);
+       gc = devm_irq_alloc_generic_chip(chip->dev, "ioh_gpio", 1, irq_start,
+                                        chip->base, handle_simple_irq);
        if (!gc)
                return -ENOMEM;
 
@@ -406,10 +407,11 @@ static int ioh_gpio_alloc_generic_chip(struct ioh_gpio *chip,
        ct->chip.irq_disable = ioh_irq_disable;
        ct->chip.irq_enable = ioh_irq_enable;
 
-       irq_setup_generic_chip(gc, IRQ_MSK(num), IRQ_GC_INIT_MASK_CACHE,
-                              IRQ_NOREQUEST | IRQ_NOPROBE, 0);
+       rv = devm_irq_setup_generic_chip(chip->dev, gc, IRQ_MSK(num),
+                                        IRQ_GC_INIT_MASK_CACHE,
+                                        IRQ_NOREQUEST | IRQ_NOPROBE, 0);
 
-       return 0;
+       return rv;
 }
 
 static int ioh_gpio_probe(struct pci_dev *pdev,