Commit 2c1d05d1 authored by Glen Lee's avatar Glen Lee Committed by Greg Kroah-Hartman

staging: wilc1000: init_irq: change argument and use netdev private wilc

This patch changes function argument type wilc with net_device and use
netdev private data member wilc instead of p_nic.
Signed-off-by: default avatarGlen Lee <glen.lee@atmel.com>
Signed-off-by: default avatarTony Cho <tony.cho@atmel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 684dc186
...@@ -259,10 +259,14 @@ irqreturn_t isr_bh_routine(int irq, void *userdata) ...@@ -259,10 +259,14 @@ irqreturn_t isr_bh_routine(int irq, void *userdata)
} }
#if (defined WILC_SPI) || (defined WILC_SDIO_IRQ_GPIO) #if (defined WILC_SPI) || (defined WILC_SDIO_IRQ_GPIO)
static int init_irq(struct wilc *p_nic) static int init_irq(struct net_device *dev)
{ {
int ret = 0; int ret = 0;
struct wilc *nic = p_nic; perInterface_wlan_t *nic;
struct wilc *wl;
nic = netdev_priv(dev);
wl = nic->wilc;
/*initialize GPIO and register IRQ num*/ /*initialize GPIO and register IRQ num*/
/*GPIO request*/ /*GPIO request*/
...@@ -275,23 +279,23 @@ static int init_irq(struct wilc *p_nic) ...@@ -275,23 +279,23 @@ static int init_irq(struct wilc *p_nic)
* ex) nic->dev_irq_num = gpio_to_irq(GPIO_NUM); * ex) nic->dev_irq_num = gpio_to_irq(GPIO_NUM);
*/ */
#else #else
nic->dev_irq_num = gpio_to_irq(GPIO_NUM); wl->dev_irq_num = gpio_to_irq(GPIO_NUM);
#endif #endif
} else { } else {
ret = -1; ret = -1;
PRINT_ER("could not obtain gpio for WILC_INTR\n"); PRINT_ER("could not obtain gpio for WILC_INTR\n");
} }
if ((ret != -1) && (request_threaded_irq(nic->dev_irq_num, isr_uh_routine, isr_bh_routine, if ((ret != -1) && (request_threaded_irq(wl->dev_irq_num, isr_uh_routine, isr_bh_routine,
IRQF_TRIGGER_LOW | IRQF_ONESHOT, /*Without IRQF_ONESHOT the uh will remain kicked in and dont gave a chance to bh*/ IRQF_TRIGGER_LOW | IRQF_ONESHOT, /*Without IRQF_ONESHOT the uh will remain kicked in and dont gave a chance to bh*/
"WILC_IRQ", nic)) < 0) { "WILC_IRQ", wl)) < 0) {
PRINT_ER("Failed to request IRQ for GPIO: %d\n", GPIO_NUM); PRINT_ER("Failed to request IRQ for GPIO: %d\n", GPIO_NUM);
ret = -1; ret = -1;
} else { } else {
PRINT_D(INIT_DBG, "IRQ request succeeded IRQ-NUM= %d on GPIO: %d\n", PRINT_D(INIT_DBG, "IRQ request succeeded IRQ-NUM= %d on GPIO: %d\n",
nic->dev_irq_num, GPIO_NUM); wl->dev_irq_num, GPIO_NUM);
} }
return ret; return ret;
...@@ -1055,7 +1059,7 @@ int wilc1000_wlan_init(struct net_device *dev, perInterface_wlan_t *p_nic) ...@@ -1055,7 +1059,7 @@ int wilc1000_wlan_init(struct net_device *dev, perInterface_wlan_t *p_nic)
} }
#if (!defined WILC_SDIO) || (defined WILC_SDIO_IRQ_GPIO) #if (!defined WILC_SDIO) || (defined WILC_SDIO_IRQ_GPIO)
if (init_irq(wl)) { if (init_irq(dev)) {
PRINT_ER("couldn't initialize IRQ\n"); PRINT_ER("couldn't initialize IRQ\n");
ret = -EIO; ret = -EIO;
goto _fail_locks_; goto _fail_locks_;
......
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