gpio/tegra: convert to use linear irqdomain

The Tegra driver tries to do the work of irq_domain_add_linear()
by reserving a bunch of descriptors somewhere and keeping track
of the base offset, then calling irq_domain_add_legacy(). Let's
stop doing that and simply use the linear IRQ domain.

For this to work: use irq_create_mapping() in the IRQ iterator
so that the descriptors get allocated here.

Cc: Rob Herring <rob.herring@calxeda.com>
Cc: Grant Likely <grant.likely@secretlab.ca>
Tested-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/drivers/gpio/gpio-tegra.c b/drivers/gpio/gpio-tegra.c
index d982593d75634a0ac1450a3f5c5b55718df353da..c7c175a4aff13ac82bed43d858875cfa1503aafa 100644 (file)
--- a/drivers/gpio/gpio-tegra.c
+++ b/drivers/gpio/gpio-tegra.c
@@ -380,7 +380,6 @@ static int __devinit tegra_gpio_probe(struct platform_device *pdev)
 {
        const struct of_device_id *match;
        struct tegra_gpio_soc_config *config;
-       int irq_base;
        struct resource *res;
        struct tegra_gpio_bank *bank;
        int gpio;
@@ -417,14 +416,11 @@ static int __devinit tegra_gpio_probe(struct platform_device *pdev)
                return -ENODEV;
        }
 
-       irq_base = irq_alloc_descs(-1, 0, tegra_gpio_chip.ngpio, 0);
-       if (irq_base < 0) {
-               dev_err(&pdev->dev, "Couldn't allocate IRQ numbers\n");
-               return -ENODEV;
-       }
-       irq_domain = irq_domain_add_legacy(pdev->dev.of_node,
-                                          tegra_gpio_chip.ngpio, irq_base, 0,
+       irq_domain = irq_domain_add_linear(pdev->dev.of_node,
+                                          tegra_gpio_chip.ngpio,
                                           &irq_domain_simple_ops, NULL);
+       if (!irq_domain)
+               return -ENODEV;
 
        for (i = 0; i < tegra_gpio_bank_count; i++) {
                res = platform_get_resource(pdev, IORESOURCE_IRQ, i);
@@ -464,7 +460,7 @@ static int __devinit tegra_gpio_probe(struct platform_device *pdev)
        gpiochip_add(&tegra_gpio_chip);
 
        for (gpio = 0; gpio < tegra_gpio_chip.ngpio; gpio++) {
-               int irq = irq_find_mapping(irq_domain, gpio);
+               int irq = irq_create_mapping(irq_domain, gpio);
                /* No validity check; all Tegra GPIOs are valid IRQs */
 
                bank = &tegra_gpio_banks[GPIO_BANK(gpio)];