of/net/mdio-gpio: Fix pdev->id issue when using devicetrees.

[~andy/linux] / drivers / pcmcia / pxa2xx_palmtc.c

diff --git a/drivers/pcmcia/pxa2xx_palmtc.c b/drivers/pcmcia/pxa2xx_palmtc.c
index 9e38de769ba3b30cbcd3d8f067783f1f314ab488..81225a7a8cbbdb893bb2b3b163b4d5d8c90683f0 100644 (file)
--- a/drivers/pcmcia/pxa2xx_palmtc.c
+++ b/drivers/pcmcia/pxa2xx_palmtc.c
@@ -26,7 +26,6 @@ static struct gpio palmtc_pcmcia_gpios[] = {
        { GPIO_NR_PALMTC_PCMCIA_POWER2, GPIOF_INIT_LOW, "PCMCIA Power 2" },
        { GPIO_NR_PALMTC_PCMCIA_POWER3, GPIOF_INIT_LOW, "PCMCIA Power 3" },
        { GPIO_NR_PALMTC_PCMCIA_RESET,  GPIOF_INIT_HIGH,"PCMCIA Reset" },
-       { GPIO_NR_PALMTC_PCMCIA_READY,  GPIOF_IN,       "PCMCIA Ready" },
        { GPIO_NR_PALMTC_PCMCIA_PWRREADY, GPIOF_IN,     "PCMCIA Power Ready" },
 };
 
@@ -37,7 +36,8 @@ static int palmtc_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
        ret = gpio_request_array(palmtc_pcmcia_gpios,
                                ARRAY_SIZE(palmtc_pcmcia_gpios));
 
-       skt->socket.pci_irq = gpio_to_irq(GPIO_NR_PALMTC_PCMCIA_READY);
+       skt->stat[SOC_STAT_RDY].gpio = GPIO_NR_PALMTC_PCMCIA_READY;
+       skt->stat[SOC_STAT_RDY].name = "PCMCIA Ready";
 
        return ret;
 }
@@ -51,10 +51,6 @@ static void palmtc_pcmcia_socket_state(struct soc_pcmcia_socket *skt,
                                        struct pcmcia_state *state)
 {
        state->detect = 1; /* always inserted */
-       state->ready  = !!gpio_get_value(GPIO_NR_PALMTC_PCMCIA_READY);
-       state->bvd1   = 1;
-       state->bvd2   = 1;
-       state->wrprot = 0;
        state->vs_3v  = 1;
        state->vs_Xv  = 0;
 }