staging: rt2860: 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/rt2860/common/spectrum.c b/drivers/staging/rt2860/common/spectrum.c
index 1dfb802aab9a4e93ae402def74a0d63c4d375e1e..c0d2f428069c171420903092cb205b82d3a44435 100644 (file)
--- a/drivers/staging/rt2860/common/spectrum.c
+++ b/drivers/staging/rt2860/common/spectrum.c
@@ -416,8 +416,7 @@ void MeasureReqTabExit(struct rt_rtmp_adapter *pAd)
 {
        NdisFreeSpinLock(&pAd->CommonCfg.MeasureReqTabLock);
 
-       if (pAd->CommonCfg.pMeasureReqTab)
-               kfree(pAd->CommonCfg.pMeasureReqTab);
+       kfree(pAd->CommonCfg.pMeasureReqTab);
        pAd->CommonCfg.pMeasureReqTab = NULL;
 
        return;
@@ -614,8 +613,7 @@ void TpcReqTabExit(struct rt_rtmp_adapter *pAd)
 {
        NdisFreeSpinLock(&pAd->CommonCfg.TpcReqTabLock);
 
-       if (pAd->CommonCfg.pTpcReqTab)
-               kfree(pAd->CommonCfg.pTpcReqTab);
+       kfree(pAd->CommonCfg.pTpcReqTab);
        pAd->CommonCfg.pTpcReqTab = NULL;
 
        return;

diff --git a/drivers/staging/rt2860/rt_linux.c b/drivers/staging/rt2860/rt_linux.c
index b3f836de332ba8a3a93f88edbb78b4b7a0438afe..e5b0427124301643b9b9bdfeb76863995ab88138 100644 (file)
--- a/drivers/staging/rt2860/rt_linux.c
+++ b/drivers/staging/rt2860/rt_linux.c
@@ -241,8 +241,7 @@ void RTMPFreeAdapter(struct rt_rtmp_adapter *pAd)
 
        os_cookie = (struct os_cookie *)pAd->OS_Cookie;
 
-       if (pAd->BeaconBuf)
-               kfree(pAd->BeaconBuf);
+       kfree(pAd->BeaconBuf);
 
        NdisFreeSpinLock(&pAd->MgmtRingLock);
 
@@ -264,8 +263,7 @@ void RTMPFreeAdapter(struct rt_rtmp_adapter *pAd)
        release_firmware(pAd->firmware);
 
        vfree(pAd);             /* pci_free_consistent(os_cookie->pci_dev,sizeof(struct rt_rtmp_adapter),pAd,os_cookie->pAd_pa); */
-       if (os_cookie)
-               kfree(os_cookie);
+       kfree(os_cookie);
 }
 
 BOOLEAN OS_Need_Clone_Packet(void)