Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-08 14:23:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Ajay Singh 2018-07-20 17:31:36 +05:30 committed by Greg Kroah-Hartman
parent 847794a1a7
commit 4b6cfa87b1
4 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/staging/wilc1000/linux_wlan.c
View File

@ -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;
}

2
drivers/staging/wilc1000/wilc_sdio.c
View File

@ -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;

2
drivers/staging/wilc1000/wilc_spi.c
View File

@ -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;
}

2
drivers/staging/wilc1000/wilc_wfi_netdevice.h
View File

@ -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;