From 34641de2ef118b9c78a842fb75e6d3cc49c1de31 Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Mon, 5 Dec 2011 19:06:06 +0800 Subject: 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 Cc: Ian Molton Cc: Jonathan Cameron Cc: Zhuang Cc: Eric Miao Cc: Russell King Signed-off-by: Axel Lin Acked-by: Haojian Zhuang Acked-by: Eric Miao Acked-by: Marek Vasut Signed-off-by: Arnd Bergmann --- drivers/pcmcia/pxa2xx_trizeps4.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'drivers/pcmcia/pxa2xx_trizeps4.c') diff --git a/drivers/pcmcia/pxa2xx_trizeps4.c b/drivers/pcmcia/pxa2xx_trizeps4.c index 57ddb969d888..7c33f898135a 100644 --- a/drivers/pcmcia/pxa2xx_trizeps4.c +++ b/drivers/pcmcia/pxa2xx_trizeps4.c @@ -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; -- cgit v1.2.3