Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 825b966f authored by Glen Lee's avatar Glen Lee Committed by Greg Kroah-Hartman
Browse files

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: default avatarGlen Lee <glen.lee@atmel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d36ec22d

drivers/staging/wilc1000/host_interface.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/staging/wilc1000/linux_wlan.c

+1 −4
Original line number Diff line number Diff line
@@ -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;

}

drivers/staging/wilc1000/wilc_wfi_netdevice.h

+0 −1
Original line number Diff line number Diff line
@@ -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);