staging: brcm80211: 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/brcm80211/brcmfmac/dhd_cdc.c b/drivers/staging/brcm80211/brcmfmac/dhd_cdc.c
index 8398fa4c03400d5d68c900d2ce791acd2118c99c..39a4d001fbd0cb57991986cc2310cbf26d73dc1f 100644 (file)
--- a/drivers/staging/brcm80211/brcmfmac/dhd_cdc.c
+++ b/drivers/staging/brcm80211/brcmfmac/dhd_cdc.c
@@ -415,8 +415,7 @@ int dhd_prot_attach(dhd_pub_t *dhd)
        return 0;
 
 fail:
-       if (cdc != NULL)
-               kfree(cdc);
+       kfree(cdc);
        return BCME_NOMEM;
 }
 

diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_common.c b/drivers/staging/brcm80211/brcmfmac/dhd_common.c
index 64d88c20354e9bb46e8b4962fabd812046db27f2..aa171f6181e950d14cdbb006ec26af47767ac551 100644 (file)
--- a/drivers/staging/brcm80211/brcmfmac/dhd_common.c
+++ b/drivers/staging/brcm80211/brcmfmac/dhd_common.c
@@ -996,8 +996,7 @@ dhd_pktfilter_offload_enable(dhd_pub_t *dhd, char *arg, int enable,
                           __func__, arg, rc));
 
 fail:
-       if (arg_org)
-               kfree(arg_org);
+       kfree(arg_org);
 }
 
 void dhd_pktfilter_offload_set(dhd_pub_t *dhd, char *arg)
@@ -1132,11 +1131,9 @@ void dhd_pktfilter_offload_set(dhd_pub_t *dhd, char *arg)
                           __func__, arg));
 
 fail:
-       if (arg_org)
-               kfree(arg_org);
+       kfree(arg_org);
 
-       if (buf)
-               kfree(buf);
+       kfree(buf);
 }
 
 void dhd_arp_offload_set(dhd_pub_t *dhd, int arp_mode)

diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
index d473f64bc0df06dad1e22db00a7781154099fab0..02c6d446934ca604340528b4c5641211c49022ef 100644 (file)
--- a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
+++ b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
@@ -1777,8 +1777,7 @@ done:
                        bcmerror = -EFAULT;
        }
 
-       if (buf)
-               kfree(buf);
+       kfree(buf);
 
        if (bcmerror > 0)
                bcmerror = 0;

diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c b/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
index dd2e36749d0ab1881da79f0c52144f022e1c5e1e..a6da7268d87a0f6340bf5447f9fb0d8a5b226277 100644 (file)
--- a/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
+++ b/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
@@ -1930,10 +1930,8 @@ static int dhdsdio_checkdied(dhd_bus_t *bus, u8 *data, uint size)
 #endif                         /* DHD_DEBUG */
 
 done:
-       if (mbuffer)
-               kfree(mbuffer);
-       if (str)
-               kfree(str);
+       kfree(mbuffer);
+       kfree(str);
 
        return bcmerror;
 }
@@ -1962,8 +1960,7 @@ static int dhdsdio_mem_dump(dhd_bus_t *bus)
                ret = dhdsdio_membytes(bus, false, start, databuf, read_size);
                if (ret) {
                        DHD_ERROR(("%s: Error membytes %d\n", __func__, ret));
-                       if (buf)
-                               kfree(buf);
+                       kfree(buf);
                        return -1;
                }
                printk(".");
@@ -2081,8 +2078,7 @@ int dhdsdio_downloadvars(dhd_bus_t *bus, void *arg, int len)
        }
 
        /* Free the old ones and replace with passed variables */
-       if (bus->vars)
-               kfree(bus->vars);
+       kfree(bus->vars);
 
        bus->vars = kmalloc(len, GFP_ATOMIC);
        bus->varsz = bus->vars ? len : 0;
@@ -5541,10 +5537,8 @@ static void dhdsdio_release_malloc(dhd_bus_t *bus)
                bus->rxlen = 0;
        }
 
-       if (bus->databuf) {
-               kfree(bus->databuf);
-               bus->databuf = NULL;
-       }
+       kfree(bus->databuf);
+       bus->databuf = NULL;
 }
 
 static void dhdsdio_release_dongle(dhd_bus_t *bus)
@@ -5732,8 +5726,7 @@ static int dhdsdio_download_code_file(struct dhd_bus *bus, char *fw_path)
        }
 
 err:
-       if (memblock)
-               kfree(memblock);
+       kfree(memblock);
 
        if (image)
                dhd_os_close_image(image);
@@ -5872,8 +5865,7 @@ static int dhdsdio_download_nvram(struct dhd_bus *bus)
        }
 
 err:
-       if (memblock)
-               kfree(memblock);
+       kfree(memblock);
 
        if (image)
                dhd_os_close_image(image);

diff --git a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_cmn.c b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_cmn.c
index fc810e342df835f1c9bd1a8d9bfe1b777ae1e88f..8f75af2ffc5856bb43f52afddedfc636d03898b5 100644 (file)
--- a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_cmn.c
+++ b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_cmn.c
@@ -759,8 +759,7 @@ wlc_phy_t *wlc_phy_attach(shared_phy_t *sh, void *regs, int bandtype, char *vars
        return &pi->pubpi_ro;
 
  err:
-       if (pi)
-               kfree(pi);
+       kfree(pi);
        return NULL;
 }
 

diff --git a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_n.c b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_n.c
index a38587309ccc485a764e942c377c2bd8f7378d97..7947c6028b6e8c8cbb44e93538f20d60643f1733 100644 (file)
--- a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_n.c
+++ b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_n.c
@@ -22383,8 +22383,7 @@ wlc_phy_gen_load_samples_nphy(phy_info_t *pi, u32 f_kHz, u16 max_val,
 
        wlc_phy_loadsampletable_nphy(pi, tone_buf, num_samps);
 
-       if (tone_buf != NULL)
-               kfree(tone_buf);
+       kfree(tone_buf);
 
        return num_samps;
 }
@@ -22431,8 +22430,7 @@ wlc_phy_loadsampletable_nphy(phy_info_t *pi, cs32 *tone_buf,
        wlc_phy_table_write_nphy(pi, NPHY_TBL_ID_SAMPLEPLAY, num_samps, 0, 32,
                                 data_buf);
 
-       if (data_buf != NULL)
-               kfree(data_buf);
+       kfree(data_buf);
 
        if (pi->phyhang_avoid)
                wlc_phy_stay_in_carriersearch_nphy(pi, false);

diff --git a/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c b/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
index a523b231cffe6dba69f75106877813f0a816a05c..66708d8df7f63e90fe77e075ce86102edda353bd 100644 (file)
--- a/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
+++ b/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
@@ -1379,8 +1379,7 @@ static void wl_free(struct wl_info *wl)
        for (t = wl->timers; t; t = next) {
                next = t->next;
 #ifdef BCMDBG
-               if (t->name)
-                       kfree(t->name);
+               kfree(t->name);
 #endif
                kfree(t);
        }
@@ -1716,8 +1715,7 @@ void wl_free_timer(struct wl_info *wl, struct wl_timer *t)
        if (wl->timers == t) {
                wl->timers = wl->timers->next;
 #ifdef BCMDBG
-               if (t->name)
-                       kfree(t->name);
+               kfree(t->name);
 #endif
                kfree(t);
                return;
@@ -1729,8 +1727,7 @@ void wl_free_timer(struct wl_info *wl, struct wl_timer *t)
                if (tmp->next == t) {
                        tmp->next = t->next;
 #ifdef BCMDBG
-                       if (t->name)
-                               kfree(t->name);
+                       kfree(t->name);
 #endif
                        kfree(t);
                        return;

diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_main.c b/drivers/staging/brcm80211/brcmsmac/wlc_main.c
index 97b320da433ac75d1c055f0d4deb8ba2c11a6849..0870dc913cda04d9a5ee8ee1799fe68318078b2e 100644 (file)
--- a/drivers/staging/brcm80211/brcmsmac/wlc_main.c
+++ b/drivers/staging/brcm80211/brcmsmac/wlc_main.c
@@ -2160,10 +2160,8 @@ uint wlc_detach(struct wlc_info *wlc)
 
 
 #ifdef BCMDBG
-       if (wlc->country_ie_override) {
-               kfree(wlc->country_ie_override);
-               wlc->country_ie_override = NULL;
-       }
+       kfree(wlc->country_ie_override);
+       wlc->country_ie_override = NULL;
 #endif                         /* BCMDBG */
 
        {

diff --git a/drivers/staging/brcm80211/util/bcmotp.c b/drivers/staging/brcm80211/util/bcmotp.c
index b080345397f0a67e161a3486f7ea8818493a87ef..ba71c108b3666520fe681167d22cbdda37c9de1b 100644 (file)
--- a/drivers/staging/brcm80211/util/bcmotp.c
+++ b/drivers/staging/brcm80211/util/bcmotp.c
@@ -830,8 +830,7 @@ static int hndotp_nvread(void *oh, char *data, uint *len)
        *len = offset;
 
  out:
-       if (rawotp)
-               kfree(rawotp);
+       kfree(rawotp);
        si_setcoreidx(oi->sih, idx);
 
        return rc;

diff --git a/drivers/staging/brcm80211/util/bcmsrom.c b/drivers/staging/brcm80211/util/bcmsrom.c
index 7373603b6646deb31a93589d44dc77ee53bc2a9b..eca35b94e96c961a694773f9d518255afe8a88d3 100644 (file)
--- a/drivers/staging/brcm80211/util/bcmsrom.c
+++ b/drivers/staging/brcm80211/util/bcmsrom.c
@@ -1527,8 +1527,7 @@ static int otp_read_pci(si_t *sih, u16 *buf, uint bufsz)
 
        memcpy(buf, otp, bufsz);
 
-       if (otp)
-               kfree(otp);
+       kfree(otp);
 
        /* Check CRC */
        if (buf[0] == 0xffff) {

diff --git a/drivers/staging/brcm80211/util/hnddma.c b/drivers/staging/brcm80211/util/hnddma.c
index 122f7d3fd704889607356bcecf5bf158bceba432..8a81eb997f995b64abdc8725e97f4b6ed4001757 100644 (file)
--- a/drivers/staging/brcm80211/util/hnddma.c
+++ b/drivers/staging/brcm80211/util/hnddma.c
@@ -559,21 +559,17 @@ static void _dma_detach(dma_info_t *di)
                                    (di->rxdpaorig));
 
        /* free packet pointer vectors */
-       if (di->txp)
-               kfree((void *)di->txp);
-       if (di->rxp)
-               kfree((void *)di->rxp);
+       kfree(di->txp);
+       kfree(di->rxp);
 
        /* free tx packet DMA handles */
-       if (di->txp_dmah)
-               kfree(di->txp_dmah);
+       kfree(di->txp_dmah);
 
        /* free rx packet DMA handles */
-       if (di->rxp_dmah)
-               kfree(di->rxp_dmah);
+       kfree(di->rxp_dmah);
 
        /* free our private info structure */
-       kfree((void *)di);
+       kfree(di);
 
 }