]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
staging: wilc1000: remove unnecessary checks in wilc_mac_close()
authorAjay Singh <ajay.kathat@microchip.com>
Sun, 2 Dec 2018 18:02:16 +0000 (18:02 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 5 Dec 2018 08:48:45 +0000 (09:48 +0100)
Remove unnecessary 'if' check in wilc_mac_close() as those conditions
will not happen.

Signed-off-by: Ajay Singh <ajay.kathat@microchip.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/wilc1000/linux_wlan.c

index 66fb9880740470ac6a294254f6a5fd947487f589..c92ee79ab2e4c82fba29037066eb16d16b10fa59 100644 (file)
@@ -896,31 +896,11 @@ netdev_tx_t wilc_mac_xmit(struct sk_buff *skb, struct net_device *ndev)
 
 static int wilc_mac_close(struct net_device *ndev)
 {
-       struct wilc_priv *priv;
        struct wilc_vif *vif = netdev_priv(ndev);
-       struct host_if_drv *hif_drv;
-       struct wilc *wl;
-
-       if (!vif || !vif->ndev || !vif->ndev->ieee80211_ptr ||
-           !vif->ndev->ieee80211_ptr->wiphy)
-               return 0;
-
-       priv = wiphy_priv(vif->ndev->ieee80211_ptr->wiphy);
-       wl = vif->wilc;
-
-       if (!priv)
-               return 0;
-
-       hif_drv = (struct host_if_drv *)priv->hif_drv;
+       struct wilc *wl = vif->wilc;
 
        netdev_dbg(ndev, "Mac close\n");
 
-       if (!wl)
-               return 0;
-
-       if (!hif_drv)
-               return 0;
-
        if (wl->open_ifcs > 0)
                wl->open_ifcs--;
        else