Revert "gpio/omap: auto request GPIO as input if used as IRQ via DT"
authorLinus Walleij <linus.walleij@linaro.org>
Mon, 29 Jul 2013 09:48:54 +0000 (11:48 +0200)
committerLinus Walleij <linus.walleij@linaro.org>
Tue, 30 Jul 2013 22:34:31 +0000 (00:34 +0200)
This reverts commit b4419e1a15905191661ffe75ba2f9e649f5d565e.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
drivers/gpio/gpio-omap.c

index 3a0c1606f8857928524a0eb5f3e287757e512d82..5e667ff91dc31d217009c014b800812671c23001 100644 (file)
@@ -1090,8 +1090,6 @@ static int omap_gpio_irq_map(struct irq_domain *d, unsigned int virq,
                             irq_hw_number_t hwirq)
 {
        struct gpio_bank *bank = d->host_data;
-       int gpio;
-       int ret;
 
        if (!bank)
                return -EINVAL;
@@ -1106,22 +1104,6 @@ static int omap_gpio_irq_map(struct irq_domain *d, unsigned int virq,
                set_irq_flags(virq, IRQF_VALID);
        }
 
-       /*
-        * REVISIT most GPIO IRQ chip drivers need to call
-        * gpio_request() before a GPIO line can be used as an
-        * IRQ. Ideally this should be handled by the IRQ core
-        * but until then this has to be done on a per driver
-        * basis. Remove this once this is managed by the core.
-        */
-       if (bank->chip.of_node) {
-               gpio = irq_to_gpio(bank, hwirq);
-               ret = gpio_request_one(gpio, GPIOF_IN, NULL);
-               if (ret) {
-                       dev_err(bank->dev, "Could not request GPIO%d\n", gpio);
-                       return ret;
-               }
-       }
-
        return 0;
 }