staging: wilc1000: rename variable from 'gpio' to 'gpio_irq'

Rename from 'gpio' to 'gpio_irq', so its inlcude the information about
the purpose of GPIO.

Signed-off-by: Ajay Singh <ajay.kathat@microchip.com>
Reviewed-by: Claudiu Beznea <claudiu.beznea@microchip.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/linux_wlan.c
index 8f43a1f6b30f88f7c72c5d00b66a661e222c6f24..74e71806e9e6c2fdb3d859b2f2e02b4c6f3c92fb 100644 (file)
--- a/drivers/staging/wilc1000/linux_wlan.c
+++ b/drivers/staging/wilc1000/linux_wlan.c
@@ -127,9 +127,9 @@ static int init_irq(struct net_device *dev)
        struct wilc_vif *vif = netdev_priv(dev);
        struct wilc *wl = vif->wilc;
 
-       if ((gpio_request(wl->gpio, "WILC_INTR") == 0) &&
-           (gpio_direction_input(wl->gpio) == 0)) {
-               wl->dev_irq_num = gpio_to_irq(wl->gpio);
+       if ((gpio_request(wl->gpio_irq, "WILC_INTR") == 0) &&
+           (gpio_direction_input(wl->gpio_irq) == 0)) {
+               wl->dev_irq_num = gpio_to_irq(wl->gpio_irq);
        } else {
                ret = -1;
                netdev_err(dev, "could not obtain gpio for WILC_INTR\n");
@@ -140,13 +140,14 @@ static int init_irq(struct net_device *dev)
                                              isr_bh_routine,
                                              IRQF_TRIGGER_LOW | IRQF_ONESHOT,
                                              "WILC_IRQ", dev) < 0) {
-               netdev_err(dev, "Failed to request IRQ GPIO: %d\n", wl->gpio);
-               gpio_free(wl->gpio);
+               netdev_err(dev, "Failed to request IRQ GPIO: %d\n",
+                          wl->gpio_irq);
+               gpio_free(wl->gpio_irq);
                ret = -1;
        } else {
                netdev_dbg(dev,
                           "IRQ request succeeded IRQ-NUM= %d on GPIO: %d\n",
-                          wl->dev_irq_num, wl->gpio);
+                          wl->dev_irq_num, wl->gpio_irq);
        }
 
        return ret;
@@ -160,7 +161,7 @@ static void deinit_irq(struct net_device *dev)
        /* Deinitialize IRQ */
        if (wilc->dev_irq_num) {
                free_irq(wilc->dev_irq_num, wilc);
-               gpio_free(wilc->gpio);
+               gpio_free(wilc->gpio_irq);
        }
 }
 
@@ -651,7 +652,7 @@ static int wilc_wlan_initialize(struct net_device *dev, struct wilc_vif *vif)
                        goto fail_locks;
                }
 
-               if (wl->gpio >= 0 && init_irq(dev)) {
+               if (wl->gpio_irq >= 0 && init_irq(dev)) {
                        ret = -EIO;
                        goto fail_locks;
                }

diff --git a/drivers/staging/wilc1000/wilc_sdio.c b/drivers/staging/wilc1000/wilc_sdio.c
index 7a2fc79d6fcaed9f1577b284513fb16bfc7ed1ff..07cb8a6fae9c3465cd1d8e8613bf8b187f4732ea 100644 (file)
--- a/drivers/staging/wilc1000/wilc_sdio.c
+++ b/drivers/staging/wilc1000/wilc_sdio.c
@@ -125,7 +125,7 @@ static int linux_sdio_probe(struct sdio_func *func,
        }
        sdio_set_drvdata(func, wilc);
        wilc->dev = &func->dev;
-       wilc->gpio = gpio;
+       wilc->gpio_irq = gpio;
 
        dev_info(&func->dev, "Driver Initializing success\n");
        return 0;

diff --git a/drivers/staging/wilc1000/wilc_spi.c b/drivers/staging/wilc1000/wilc_spi.c
index 69b2c3cc75dc96ef25ddb19b40cd49703a578144..8cb286b317ecf468560682e445428159291b6c23 100644 (file)
--- a/drivers/staging/wilc1000/wilc_spi.c
+++ b/drivers/staging/wilc1000/wilc_spi.c
@@ -119,7 +119,7 @@ static int wilc_bus_probe(struct spi_device *spi)
 
        spi_set_drvdata(spi, wilc);
        wilc->dev = &spi->dev;
-       wilc->gpio = gpio;
+       wilc->gpio_irq = gpio;
 
        return 0;
 }

diff --git a/drivers/staging/wilc1000/wilc_wfi_netdevice.h b/drivers/staging/wilc1000/wilc_wfi_netdevice.h
index add76c707532f15cbdaf73e2584b1f253b3895ca..74c2a17ecdca09d6e33946c1f1812eec8affbf96 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wfi_netdevice.h
+++ b/drivers/staging/wilc1000/wilc_wfi_netdevice.h
@@ -121,7 +121,7 @@ struct wilc {
        const struct wilc_hif_func *hif_func;
        int io_type;
        int mac_status;
-       int gpio;
+       int gpio_irq;
        bool initialized;
        int dev_irq_num;
        int close;