Merge branch 'stable/for-linus-fixes-3.3' of git://git.kernel.org/pub/scm/linux/kerne...

[firefly-linux-kernel-4.4.55.git] / drivers / pcmcia / pxa2xx_trizeps4.c

diff --git a/drivers/pcmcia/pxa2xx_trizeps4.c b/drivers/pcmcia/pxa2xx_trizeps4.c
index 57ddb969d888508c68cb701fd1252e16c6d00ada..7c33f898135ab165bf876d3267f072ef40ad282b 100644 (file)
--- 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;