mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

staging: wilc1000: use wilc instead of wilc_dev and remove wilc_dev 

This patch changes wilc_dev with wilc in the function call
wilc_wlan_get_num_conn_ifcs, and remove wilc_dev and it's related codes.

Signed-off-by: Glen Lee <glen.lee@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Glen Lee 2015-11-18 15:11:37 +09:00 committed by Greg Kroah-Hartman
parent d36ec22d1d
commit 825b966f9e
3 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2919,7 +2919,7 @@ static int hostIFthread(void *pvArg)
del_timer(&hif_drv->scan_timer);
PRINT_D(HOSTINF_DBG, "scan completed successfully\n");
if (!wilc_wlan_get_num_conn_ifcs(wilc_dev))
if (!wilc_wlan_get_num_conn_ifcs(wilc))
wilc_chip_sleep_manually(wilc);
Handle_ScanDone(msg.drv, SCAN_EVENT_DONE);

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

@ -43,8 +43,6 @@ static int mac_init_fn(struct net_device *ndev);
static struct net_device_stats *mac_stats(struct net_device *dev);
static int mac_ioctl(struct net_device *ndev, struct ifreq *req, int cmd);
static void wilc_set_multicast_list(struct net_device *dev);
struct wilc *wilc_dev;
EXPORT_SYMBOL_GPL(wilc_dev);
bool wilc_enable_ps = true;
@ -1432,7 +1430,7 @@ int wilc_netdev_init(struct wilc **wilc, struct device *dev, int io_type,
sema_init(&close_exit_sync, 0);
wl = kzalloc(sizeof(*wilc_dev), GFP_KERNEL);
wl = kzalloc(sizeof(*wl), GFP_KERNEL);
if (!wl)
return -ENOMEM;
@ -1495,7 +1493,6 @@ int wilc_netdev_init(struct wilc **wilc, struct device *dev, int io_type,
nic->iftype = STATION_MODE;
nic->mac_opened = 0;
}
wilc_dev = *wilc = wl;
return 0;
}

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

@ -205,7 +205,6 @@ struct WILC_WFI_mon_priv {
int wilc1000_wlan_init(struct net_device *dev, perInterface_wlan_t *p_nic);
extern struct wilc *wilc_dev;
extern struct net_device *WILC_WFI_devs[];
void wilc_frmw_to_linux(struct wilc *wilc, u8 *buff, u32 size, u32 pkt_offset);
void wilc_mac_indicate(struct wilc *wilc, int flag);