pcmcia: pxa: replace IRQ_GPIO() with gpio_to_irq()
Since commit 6384fd "ARM: pxa: rename IRQ_GPIO to PXA_GPIO_TO_IRQ", I got buid errors due to implicit declaration of function 'IRQ_GPIO'. Use common gpio_to_irq() to replace machine dependant macro IRQ_GPIO(). Cc: Marek Vasut <marek.vasut@gmail.com> Cc: Ian Molton <spyro@f2s.com> Cc: Jonathan Cameron <jic23@cam.ac.uk> Cc: Zhuang <haojian.zhuang@marvell.com> Cc: Eric Miao <eric.y.miao@gmail.com> Cc: Russell King <linux@arm.linux.org.uk> Signed-off-by: Axel Lin <axel.lin@gmail.com> Acked-by: Haojian Zhuang <haojian.zhuang@gmail.com> Acked-by: Eric Miao <eric.y.miao@gmail.com> Acked-by: Marek Vasut <marek.vasut@gmail.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
@@ -30,7 +30,7 @@
|
||||
extern void board_pcmcia_power(int power);
|
||||
|
||||
static struct pcmcia_irqs irqs[] = {
|
||||
{ 0, IRQ_GPIO(GPIO_PCD), "cs0_cd" }
|
||||
{ .sock = 0, .str = "cs0_cd" }
|
||||
/* on other baseboards we can have more inputs */
|
||||
};
|
||||
|
||||
@@ -53,7 +53,8 @@ static int trizeps_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
|
||||
gpio_free(GPIO_PRDY);
|
||||
return -EINVAL;
|
||||
}
|
||||
skt->socket.pci_irq = IRQ_GPIO(GPIO_PRDY);
|
||||
skt->socket.pci_irq = gpio_to_irq(GPIO_PRDY);
|
||||
irqs[0].irq = gpio_to_irq(GPIO_PCD);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
|
Reference in New Issue
Block a user