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

Commit 77eebe82 authored by Binoy Jayan's avatar Binoy Jayan Committed by Greg Kroah-Hartman
Browse files

staging: wilc1000: Remove semaphore close_exit_sync 



The semaphore 'close_exit_sync' does not serve any purpose other
than delaying the deregistration of the device which it is trying
to protect from shared access. 'up' is called only when a subdevice
is closed and not when it is opened. So, the semaphore count only
goes up when the device is used.

Signed-off-by: default avatarBinoy Jayan <binoy.jayan@linaro.org>
Reviewed-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 04247e7d

drivers/staging/wilc1000/linux_wlan.c

+0 −7
Original line number Diff line number Diff line
@@ -31,8 +31,6 @@ static struct notifier_block g_dev_notifier = { 
	.notifier_call = dev_state_ev_handler

};



static struct semaphore close_exit_sync;



static int wlan_deinit_locks(struct net_device *dev);

static void wlan_deinitialize_threads(struct net_device *dev);
@@ -1088,7 +1086,6 @@ int wilc_mac_close(struct net_device *ndev) 
		WILC_WFI_deinit_mon_interface();

	}



	up(&close_exit_sync);

	vif->mac_opened = 0;



	return 0;
@@ -1232,8 +1229,6 @@ void wilc_netdev_cleanup(struct wilc *wilc) 
	}



	if (wilc && (wilc->vif[0]->ndev || wilc->vif[1]->ndev)) {

		wilc_lock_timeout(wilc, &close_exit_sync, 5 * 1000);



		for (i = 0; i < NUM_CONCURRENT_IFC; i++)

			if (wilc->vif[i]->ndev)

				if (vif[i]->mac_opened)
@@ -1258,8 +1253,6 @@ int wilc_netdev_init(struct wilc **wilc, struct device *dev, int io_type, 
	struct net_device *ndev;

	struct wilc *wl;



	sema_init(&close_exit_sync, 0);



	wl = kzalloc(sizeof(*wl), GFP_KERNEL);

	if (!wl)

		return -ENOMEM;