From 1646ff6c6618b04929823f8bfe9b3e505e28fe0e Mon Sep 17 00:00:00 2001 From: Dafna Hirschfeld Date: Thu, 22 Feb 2018 09:10:12 +0200 Subject: staging: wilc1000: remove 'if' on field address Remove 'if' statements testing struct's field address. Since such statements always return true, they are redundant. Signed-off-by: Dafna Hirschfeld Acked-by: Julia Lawall Signed-off-by: Greg Kroah-Hartman --- drivers/staging/wilc1000/linux_wlan.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/linux_wlan.c index d9725efe0537..cf746f2462cd 100644 --- a/drivers/staging/wilc1000/linux_wlan.c +++ b/drivers/staging/wilc1000/linux_wlan.c @@ -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); -- cgit v1.2.3