diff options
| author | Nicolas Ferre | 2012-02-11 14:23:06 +0100 |
|---|---|---|
| committer | Nicolas Ferre | 2012-03-01 13:29:01 +0100 |
| commit | e44990790a2528dc825a258bf931c745710f652e (patch) | |
| tree | 7f6da3cdcd0d1a729b2d1043423309d181313592 /drivers/usb | |
| parent | ARM: at91/snapper9260: move gpio_to_irq out of structure initialization (diff) | |
| download | kernel-qcow2-linux-e44990790a2528dc825a258bf931c745710f652e.tar.gz kernel-qcow2-linux-e44990790a2528dc825a258bf931c745710f652e.tar.xz kernel-qcow2-linux-e44990790a2528dc825a258bf931c745710f652e.zip | |
ARM/USB: at91/ohci-at91: remove the use of irq_to_gpio
irq_to_gpio() macro will be removed from AT91 GPIO interrupt
controller. So we replace it with the use of gpio_to_irq()
and a reworked test.
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: linux-usb@vger.kernel.org
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/host/ohci-at91.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c index 77afabc77f9b..8e855eb0bf89 100644 --- a/drivers/usb/host/ohci-at91.c +++ b/drivers/usb/host/ohci-at91.c @@ -448,10 +448,11 @@ static irqreturn_t ohci_hcd_at91_overcurrent_irq(int irq, void *data) /* From the GPIO notifying the over-current situation, find * out the corresponding port */ - gpio = irq_to_gpio(irq); for (port = 0; port < ARRAY_SIZE(pdata->overcurrent_pin); port++) { - if (pdata->overcurrent_pin[port] == gpio) + if (gpio_to_irq(pdata->overcurrent_pin[port]) == irq) { + gpio = pdata->overcurrent_pin[port]; break; + } } if (port == ARRAY_SIZE(pdata->overcurrent_pin)) { |