staging: rtl8192e: Remove NULL check before kfree

This patch was generated by the following semantic patch:
// <smpl>
@@ expression E; @@
- if (E != NULL) { kfree(E); }
+ kfree(E);

@@ expression E; @@
- if (E != NULL) { kfree(E); E = NULL; }
+ kfree(E);
+ E = NULL;
// </smpl>

Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/rtl8192e/ieee80211/ieee80211_module.c b/drivers/staging/rtl8192e/ieee80211/ieee80211_module.c
index 67bcd41e66b134ea5cb8058870ddf33f5d8b396a..663b0b8e109500fd4baf376b8171a1e98eb567ff 100644 (file)
--- a/drivers/staging/rtl8192e/ieee80211/ieee80211_module.c
+++ b/drivers/staging/rtl8192e/ieee80211/ieee80211_module.c
@@ -195,11 +195,8 @@ void free_ieee80211(struct net_device *dev)
 {
        struct ieee80211_device *ieee = netdev_priv(dev);
        int i;
-       if (ieee->pHTInfo != NULL)
-       {
-               kfree(ieee->pHTInfo);
-               ieee->pHTInfo = NULL;
-       }
+       kfree(ieee->pHTInfo);
+       ieee->pHTInfo = NULL;
        RemoveAllTS(ieee);
        ieee80211_softmac_free(ieee);
        del_timer_sync(&ieee->crypt_deinit_timer);

diff --git a/drivers/staging/rtl8192e/ieee80211/ieee80211_rx.c b/drivers/staging/rtl8192e/ieee80211/ieee80211_rx.c
index e2eac7cadf4f372e2c4d1fc988dd591f5468211c..57acb3f21adf2a83c19ff2df5cde0a97d34cb25c 100644 (file)
--- a/drivers/staging/rtl8192e/ieee80211/ieee80211_rx.c
+++ b/drivers/staging/rtl8192e/ieee80211/ieee80211_rx.c
@@ -1411,11 +1411,8 @@ int ieee80211_rtl_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
        return 1;
 
  rx_dropped:
-       if (rxb != NULL)
-       {
-               kfree(rxb);
-               rxb = NULL;
-       }
+       kfree(rxb);
+       rxb = NULL;
        stats->rx_dropped++;
 
        /* Returning 0 indicates to caller that we have not handled the SKB--

diff --git a/drivers/staging/rtl8192e/ieee80211/ieee80211_softmac.c b/drivers/staging/rtl8192e/ieee80211/ieee80211_softmac.c
index fc96676bb9ce75c65a79bc04e1404c7dfd5c1ab9..8d73a731376667295aada301d0a45b1ad1afe9db 100644 (file)
--- a/drivers/staging/rtl8192e/ieee80211/ieee80211_softmac.c
+++ b/drivers/staging/rtl8192e/ieee80211/ieee80211_softmac.c
@@ -2818,11 +2818,8 @@ void ieee80211_softmac_free(struct ieee80211_device *ieee)
 {
        down(&ieee->wx_sem);
 #ifdef ENABLE_DOT11D
-       if(NULL != ieee->pDot11dInfo)
-       {
-               kfree(ieee->pDot11dInfo);
-               ieee->pDot11dInfo = NULL;
-       }
+       kfree(ieee->pDot11dInfo);
+       ieee->pDot11dInfo = NULL;
 #endif
        del_timer_sync(&ieee->associate_timer);
 

diff --git a/drivers/staging/rtl8192e/ieee80211/ieee80211_wx.c b/drivers/staging/rtl8192e/ieee80211/ieee80211_wx.c
index cac340e5238a8db3e4affef45a04ddabbb0afe0a..bb0ff26bd8430909a1adeb6c4e736d12e101d9b7 100644 (file)
--- a/drivers/staging/rtl8192e/ieee80211/ieee80211_wx.c
+++ b/drivers/staging/rtl8192e/ieee80211/ieee80211_wx.c
@@ -862,7 +862,6 @@ int ieee80211_wx_set_gen_ie(struct ieee80211_device *ieee, u8 *ie, size_t len)
                ieee->wpa_ie_len = len;
        }
        else{
-               if (ieee->wpa_ie)
                kfree(ieee->wpa_ie);
                ieee->wpa_ie = NULL;
                ieee->wpa_ie_len = 0;