diff options
| author | Tony Cho | 2015-10-20 07:26:56 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2015-10-25 02:14:35 +0100 |
| commit | 12ba5416dc7702cc5bb6d8611d4c288302722c6a (patch) | |
| tree | 9d416a535f84fa1b77df8d4a0e791bb8a3ccae17 /drivers/staging/wilc1000/linux_wlan_sdio.c | |
| parent | staging: wilc1000: introduce struct wilc_sdio for sdio data (diff) | |
| download | kernel-qcow2-linux-12ba5416dc7702cc5bb6d8611d4c288302722c6a.tar.gz kernel-qcow2-linux-12ba5416dc7702cc5bb6d8611d4c288302722c6a.tar.xz kernel-qcow2-linux-12ba5416dc7702cc5bb6d8611d4c288302722c6a.zip | |
staging: wilc1000: assign pointer of g_linux_wlan to sdio device data
This patch assigns wl pointer to sdio device data. The global variable
g_linux_wlan will be removed finally.
Signed-off-by: Tony Cho <tony.cho@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/wilc1000/linux_wlan_sdio.c')
| -rw-r--r-- | drivers/staging/wilc1000/linux_wlan_sdio.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/staging/wilc1000/linux_wlan_sdio.c b/drivers/staging/wilc1000/linux_wlan_sdio.c index 9a45871e9093..1f8d8743f376 100644 --- a/drivers/staging/wilc1000/linux_wlan_sdio.c +++ b/drivers/staging/wilc1000/linux_wlan_sdio.c @@ -27,7 +27,6 @@ struct wilc_sdio { }; struct sdio_func *local_sdio_func; -extern int wilc_netdev_init(void); extern void wilc_handle_isr(void); static unsigned int sdio_default_speed; @@ -117,6 +116,7 @@ int linux_sdio_cmd53(sdio_cmd53_t *cmd) static int linux_sdio_probe(struct sdio_func *func, const struct sdio_device_id *id) { struct wilc_sdio *wl_sdio; + struct wilc *wilc; PRINT_D(INIT_DBG, "probe function\n"); wl_sdio = kzalloc(sizeof(struct wilc_sdio), GFP_KERNEL); @@ -125,12 +125,13 @@ static int linux_sdio_probe(struct sdio_func *func, const struct sdio_device_id PRINT_D(INIT_DBG, "Initializing netdev\n"); local_sdio_func = func; - if (wilc_netdev_init()) { + if (wilc_netdev_init(&wilc)) { PRINT_ER("Couldn't initialize netdev\n"); kfree(wl_sdio); return -1; } wl_sdio->func = func; + wl_sdio->wilc = wilc; sdio_set_drvdata(func, wl_sdio); printk("Driver Initializing success\n"); |