staging: brcm80211: optimize kmalloc to kzalloc

Use kzalloc rather than kmalloc followed by memset with 0.
Found by coccinelle.

Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
index ab8e688d9620e5bcd8180c2ccff4974e360046bd..d473f64bc0df06dad1e22db00a7781154099fab0 100644 (file)
--- a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
+++ b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
@@ -1931,14 +1931,12 @@ dhd_pub_t *dhd_attach(struct dhd_bus *bus, uint bus_hdrlen)
        }
 
        /* Allocate primary dhd_info */
-       dhd = kmalloc(sizeof(dhd_info_t), GFP_ATOMIC);
+       dhd = kzalloc(sizeof(dhd_info_t), GFP_ATOMIC);
        if (!dhd) {
                DHD_ERROR(("%s: OOM - alloc dhd_info\n", __func__));
                goto fail;
        }
 
-       memset(dhd, 0, sizeof(dhd_info_t));
-
        /*
         * Save the dhd_info into the priv
         */

diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c b/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
index 971d406890989522e61812c3ce3265a896614afe..b74b3c6ecf8d1edc0c00ba2fc64297d21bc06f59 100644 (file)
--- a/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
+++ b/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
@@ -2528,11 +2528,10 @@ static int dhdsdio_write_vars(dhd_bus_t *bus)
        varaddr = (bus->ramsize - 4) - varsize;
 
        if (bus->vars) {
-               vbuffer = kmalloc(varsize, GFP_ATOMIC);
+               vbuffer = kzalloc(varsize, GFP_ATOMIC);
                if (!vbuffer)
                        return BCME_NOMEM;
 
-               memset(vbuffer, 0, varsize);
                memcpy(vbuffer, bus->vars, bus->varsz);
 
                /* Write the vars list */
@@ -5258,13 +5257,12 @@ dhdsdio_probe_attach(struct dhd_bus *bus, void *sdh, void *regsva, u16 devid)
                udelay(65);
 
                for (fn = 0; fn <= numfn; fn++) {
-                       cis[fn] = kmalloc(SBSDIO_CIS_SIZE_LIMIT, GFP_ATOMIC);
+                       cis[fn] = kzalloc(SBSDIO_CIS_SIZE_LIMIT, GFP_ATOMIC);
                        if (!cis[fn]) {
                                DHD_INFO(("dhdsdio_probe: fn %d cis malloc "
                                        "failed\n", fn));
                                break;
                        }
-                       memset(cis[fn], 0, SBSDIO_CIS_SIZE_LIMIT);
 
                        err = bcmsdh_cis_read(sdh, fn, cis[fn],
                                                SBSDIO_CIS_SIZE_LIMIT);

diff --git a/drivers/staging/brcm80211/brcmfmac/wl_iw.c b/drivers/staging/brcm80211/brcmfmac/wl_iw.c
index 4d16644544ae7d7b89b714e43a0c5fafd873d186..b49957fb758663e9a6a89f278061b820c0d8304f 100644 (file)
--- a/drivers/staging/brcm80211/brcmfmac/wl_iw.c
+++ b/drivers/staging/brcm80211/brcmfmac/wl_iw.c
@@ -862,10 +862,9 @@ wl_iw_get_aplist(struct net_device *dev,
        if (!extra)
                return -EINVAL;
 
-       list = kmalloc(buflen, GFP_KERNEL);
+       list = kzalloc(buflen, GFP_KERNEL);
        if (!list)
                return -ENOMEM;
-       memset(list, 0, buflen);
        list->buflen = cpu_to_le32(buflen);
        error = dev_wlc_ioctl(dev, WLC_SCAN_RESULTS, list, buflen);
        if (error) {
@@ -3667,11 +3666,10 @@ int wl_iw_attach(struct net_device *dev, void *dhdp)
        params_size =
            (WL_SCAN_PARAMS_FIXED_SIZE + offsetof(wl_iscan_params_t, params));
 #endif
-       iscan = kmalloc(sizeof(iscan_info_t), GFP_KERNEL);
+       iscan = kzalloc(sizeof(iscan_info_t), GFP_KERNEL);
 
        if (!iscan)
                return -ENOMEM;
-       memset(iscan, 0, sizeof(iscan_info_t));
 
        iscan->iscan_ex_params_p = kmalloc(params_size, GFP_KERNEL);
        if (!iscan->iscan_ex_params_p)
@@ -3705,11 +3703,10 @@ int wl_iw_attach(struct net_device *dev, void *dhdp)
        priv_dev = dev;
        MUTEX_LOCK_SOFTAP_SET_INIT(iw->pub);
 #endif
-       g_scan = kmalloc(G_SCAN_RESULTS, GFP_KERNEL);
+       g_scan = kzalloc(G_SCAN_RESULTS, GFP_KERNEL);
        if (!g_scan)
                return -ENOMEM;
 
-       memset(g_scan, 0, G_SCAN_RESULTS);
        g_scan_specified_ssid = 0;
 
        return 0;

diff --git a/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c b/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
index d70ed3d990d6c5528deda0cff84e297bde0c610e..3550551da3169e03b89efc3863d0eb45de9dc998 100644 (file)
--- a/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
+++ b/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
@@ -1634,14 +1634,12 @@ struct wl_timer *wl_init_timer(struct wl_info *wl, void (*fn) (void *arg),
 {
        struct wl_timer *t;
 
-       t = kmalloc(sizeof(struct wl_timer), GFP_ATOMIC);
+       t = kzalloc(sizeof(struct wl_timer), GFP_ATOMIC);
        if (!t) {
                WL_ERROR("wl%d: wl_init_timer: out of memory\n", wl->pub->unit);
                return 0;
        }
 
-       memset(t, 0, sizeof(struct wl_timer));
-
        init_timer(&t->timer);
        t->timer.data = (unsigned long) t;
        t->timer.function = wl_timer;