|
@@ -628,8 +628,7 @@ void wilc1000_wlan_deinit(struct net_device *dev)
|
|
|
wl->hif_func->disable_interrupt(wl);
|
|
|
mutex_unlock(&wl->hif_cs);
|
|
|
}
|
|
|
- if (&wl->txq_event)
|
|
|
- complete(&wl->txq_event);
|
|
|
+ complete(&wl->txq_event);
|
|
|
|
|
|
wlan_deinitialize_threads(dev);
|
|
|
deinit_irq(dev);
|
|
@@ -677,11 +676,8 @@ static int wlan_deinit_locks(struct net_device *dev)
|
|
|
vif = netdev_priv(dev);
|
|
|
wilc = vif->wilc;
|
|
|
|
|
|
- if (&wilc->hif_cs)
|
|
|
- mutex_destroy(&wilc->hif_cs);
|
|
|
-
|
|
|
- if (&wilc->rxq_cs)
|
|
|
- mutex_destroy(&wilc->rxq_cs);
|
|
|
+ mutex_destroy(&wilc->hif_cs);
|
|
|
+ mutex_destroy(&wilc->rxq_cs);
|
|
|
|
|
|
return 0;
|
|
|
}
|
|
@@ -716,8 +712,7 @@ static void wlan_deinitialize_threads(struct net_device *dev)
|
|
|
|
|
|
wl->close = 1;
|
|
|
|
|
|
- if (&wl->txq_event)
|
|
|
- complete(&wl->txq_event);
|
|
|
+ complete(&wl->txq_event);
|
|
|
|
|
|
if (wl->txq_thread) {
|
|
|
kthread_stop(wl->txq_thread);
|