Commit 4b6cfa87 authored by Ajay Singh's avatar Ajay Singh Committed by Greg Kroah-Hartman

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: default avatarAjay Singh <ajay.kathat@microchip.com>
Reviewed-by: default avatarClaudiu Beznea <claudiu.beznea@microchip.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 847794a1
...@@ -127,9 +127,9 @@ static int init_irq(struct net_device *dev) ...@@ -127,9 +127,9 @@ static int init_irq(struct net_device *dev)
struct wilc_vif *vif = netdev_priv(dev); struct wilc_vif *vif = netdev_priv(dev);
struct wilc *wl = vif->wilc; struct wilc *wl = vif->wilc;
if ((gpio_request(wl->gpio, "WILC_INTR") == 0) && if ((gpio_request(wl->gpio_irq, "WILC_INTR") == 0) &&
(gpio_direction_input(wl->gpio) == 0)) { (gpio_direction_input(wl->gpio_irq) == 0)) {
wl->dev_irq_num = gpio_to_irq(wl->gpio); wl->dev_irq_num = gpio_to_irq(wl->gpio_irq);
} else { } else {
ret = -1; ret = -1;
netdev_err(dev, "could not obtain gpio for WILC_INTR\n"); netdev_err(dev, "could not obtain gpio for WILC_INTR\n");
...@@ -140,13 +140,14 @@ static int init_irq(struct net_device *dev) ...@@ -140,13 +140,14 @@ static int init_irq(struct net_device *dev)
isr_bh_routine, isr_bh_routine,
IRQF_TRIGGER_LOW | IRQF_ONESHOT, IRQF_TRIGGER_LOW | IRQF_ONESHOT,
"WILC_IRQ", dev) < 0) { "WILC_IRQ", dev) < 0) {
netdev_err(dev, "Failed to request IRQ GPIO: %d\n", wl->gpio); netdev_err(dev, "Failed to request IRQ GPIO: %d\n",
gpio_free(wl->gpio); wl->gpio_irq);
gpio_free(wl->gpio_irq);
ret = -1; ret = -1;
} else { } else {
netdev_dbg(dev, netdev_dbg(dev,
"IRQ request succeeded IRQ-NUM= %d on GPIO: %d\n", "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; return ret;
...@@ -160,7 +161,7 @@ static void deinit_irq(struct net_device *dev) ...@@ -160,7 +161,7 @@ static void deinit_irq(struct net_device *dev)
/* Deinitialize IRQ */ /* Deinitialize IRQ */
if (wilc->dev_irq_num) { if (wilc->dev_irq_num) {
free_irq(wilc->dev_irq_num, wilc); 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) ...@@ -651,7 +652,7 @@ static int wilc_wlan_initialize(struct net_device *dev, struct wilc_vif *vif)
goto fail_locks; goto fail_locks;
} }
if (wl->gpio >= 0 && init_irq(dev)) { if (wl->gpio_irq >= 0 && init_irq(dev)) {
ret = -EIO; ret = -EIO;
goto fail_locks; goto fail_locks;
} }
......
...@@ -125,7 +125,7 @@ static int linux_sdio_probe(struct sdio_func *func, ...@@ -125,7 +125,7 @@ static int linux_sdio_probe(struct sdio_func *func,
} }
sdio_set_drvdata(func, wilc); sdio_set_drvdata(func, wilc);
wilc->dev = &func->dev; wilc->dev = &func->dev;
wilc->gpio = gpio; wilc->gpio_irq = gpio;
dev_info(&func->dev, "Driver Initializing success\n"); dev_info(&func->dev, "Driver Initializing success\n");
return 0; return 0;
......
...@@ -119,7 +119,7 @@ static int wilc_bus_probe(struct spi_device *spi) ...@@ -119,7 +119,7 @@ static int wilc_bus_probe(struct spi_device *spi)
spi_set_drvdata(spi, wilc); spi_set_drvdata(spi, wilc);
wilc->dev = &spi->dev; wilc->dev = &spi->dev;
wilc->gpio = gpio; wilc->gpio_irq = gpio;
return 0; return 0;
} }
......
...@@ -121,7 +121,7 @@ struct wilc { ...@@ -121,7 +121,7 @@ struct wilc {
const struct wilc_hif_func *hif_func; const struct wilc_hif_func *hif_func;
int io_type; int io_type;
int mac_status; int mac_status;
int gpio; int gpio_irq;
bool initialized; bool initialized;
int dev_irq_num; int dev_irq_num;
int close; int close;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment