1 files changed, 9 insertions, 6 deletions

diff --git a/drivers/pcmcia/pxa2xx_trizeps4.c b/drivers/pcmcia/pxa2xx_trizeps4.c
index b7e596620db1..b829e655457b 100644
--- a/drivers/pcmcia/pxa2xx_trizeps4.c
+++ b/drivers/pcmcia/pxa2xx_trizeps4.c
@@ -69,15 +69,15 @@ static int trizeps_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
         for (i = 0; i < ARRAY_SIZE(irqs); i++) {
                 if (irqs[i].sock != skt->nr)
                         continue;
-                if (gpio_request(IRQ_TO_GPIO(irqs[i].irq), irqs[i].str) < 0) {
+                if (gpio_request(irq_to_gpio(irqs[i].irq), irqs[i].str) < 0) {
                         pr_err("%s: sock %d unable to request gpio %d\n",
-                                __func__, skt->nr, IRQ_TO_GPIO(irqs[i].irq));
+                                __func__, skt->nr, irq_to_gpio(irqs[i].irq));
                         ret = -EBUSY;
                         goto error;
                 }
-                if (gpio_direction_input(IRQ_TO_GPIO(irqs[i].irq)) < 0) {
+                if (gpio_direction_input(irq_to_gpio(irqs[i].irq)) < 0) {
                         pr_err("%s: sock %d unable to set input gpio %d\n",
-                                __func__, skt->nr, IRQ_TO_GPIO(irqs[i].irq));
+                                __func__, skt->nr, irq_to_gpio(irqs[i].irq));
                         ret = -EINVAL;
                         goto error;
                 }
@@ -86,7 +86,7 @@ static int trizeps_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
 
 error:
         for (; i >= 0; i--) {
-                gpio_free(IRQ_TO_GPIO(irqs[i].irq));
+                gpio_free(irq_to_gpio(irqs[i].irq));
         }
         return (ret);
 }
@@ -97,7 +97,7 @@ static void trizeps_pcmcia_hw_shutdown(struct soc_pcmcia_socket *skt)
         /* free allocated gpio's */
         gpio_free(GPIO_PRDY);
         for (i = 0; i < ARRAY_SIZE(irqs); i++)
-                gpio_free(IRQ_TO_GPIO(irqs[i].irq));
+                gpio_free(irq_to_gpio(irqs[i].irq));
 }
 
 static unsigned long trizeps_pcmcia_status[2];
@@ -226,6 +226,9 @@ static int __init trizeps_pcmcia_init(void)
 {
         int ret;
 
+        if (!machine_is_trizeps4() && !machine_is_trizeps4wl())
+                return -ENODEV;
+
         trizeps_pcmcia_device = platform_device_alloc("pxa2xx-pcmcia", -1);
         if (!trizeps_pcmcia_device)
                 return -ENOMEM;