Use kzalloc rather than kmalloc followed by memset with 0.
Found by coccinelle.
Signed-off-by: Alexander Beregalov <[email protected]>
---
drivers/staging/bcm/Bcmchar.c | 4 +---
drivers/staging/bcm/Misc.c | 6 ++----
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/bcm/Bcmchar.c b/drivers/staging/bcm/Bcmchar.c
index 3d9055a..867dbf1 100644
--- a/drivers/staging/bcm/Bcmchar.c
+++ b/drivers/staging/bcm/Bcmchar.c
@@ -19,12 +19,10 @@ static int bcm_char_open(struct inode *inode, struct file * filp)
PPER_TARANG_DATA pTarang = NULL;
Adapter = GET_BCM_ADAPTER(gblpnetdev);
- pTarang = (PPER_TARANG_DATA)kmalloc(sizeof(PER_TARANG_DATA),
- GFP_KERNEL);
+ pTarang = kzalloc(sizeof(PER_TARANG_DATA), GFP_KERNEL);
if (!pTarang)
return -ENOMEM;
- memset(pTarang, 0, sizeof(PER_TARANG_DATA));
pTarang->Adapter = Adapter;
pTarang->RxCntrlMsgBitMask = 0xFFFFFFFF & ~(1 << 0xB);
diff --git a/drivers/staging/bcm/Misc.c b/drivers/staging/bcm/Misc.c
index f585aae..d624f35 100644
--- a/drivers/staging/bcm/Misc.c
+++ b/drivers/staging/bcm/Misc.c
@@ -498,13 +498,12 @@ VOID LinkMessage(PMINI_ADAPTER Adapter)
BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, LINK_UP_MSG, DBG_LVL_ALL, "=====>");
if(Adapter->LinkStatus == SYNC_UP_REQUEST && Adapter->AutoSyncup)
{
- pstLinkRequest=kmalloc(sizeof(LINK_REQUEST), GFP_ATOMIC);
+ pstLinkRequest = kzalloc(sizeof(LINK_REQUEST), GFP_ATOMIC);
if(!pstLinkRequest)
{
BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, LINK_UP_MSG, DBG_LVL_ALL, "Can not allocate memory for Link request!");
return;
}
- memset(pstLinkRequest,0,sizeof(LINK_REQUEST));
//sync up request...
Adapter->LinkStatus = WAIT_FOR_SYNC;// current link status
BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, LINK_UP_MSG, DBG_LVL_ALL, "Requesting For SyncUp...");
@@ -516,13 +515,12 @@ VOID LinkMessage(PMINI_ADAPTER Adapter)
}
else if(Adapter->LinkStatus == PHY_SYNC_ACHIVED && Adapter->AutoLinkUp)
{
- pstLinkRequest=kmalloc(sizeof(LINK_REQUEST), GFP_ATOMIC);
+ pstLinkRequest = kzalloc(sizeof(LINK_REQUEST), GFP_ATOMIC);
if(!pstLinkRequest)
{
BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, LINK_UP_MSG, DBG_LVL_ALL, "Can not allocate memory for Link request!");
return;
}
- memset(pstLinkRequest,0,sizeof(LINK_REQUEST));
//LINK_UP_REQUEST
BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, LINK_UP_MSG, DBG_LVL_ALL, "Requesting For LinkUp...");
pstLinkRequest->szData[0]=LINK_UP_REQ_PAYLOAD;
--
1.7.4.1
Use kzalloc rather than kmalloc followed by memset with 0.
Found by coccinelle.
Signed-off-by: Alexander Beregalov <[email protected]>
---
drivers/staging/brcm80211/brcmfmac/dhd_linux.c | 4 +---
drivers/staging/brcm80211/brcmfmac/dhd_sdio.c | 6 ++----
drivers/staging/brcm80211/brcmfmac/wl_iw.c | 9 +++------
drivers/staging/brcm80211/brcmsmac/wl_mac80211.c | 4 +---
4 files changed, 7 insertions(+), 16 deletions(-)
diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
index ab8e688..d473f64 100644
--- 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 971d406..b74b3c6 100644
--- 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 4d16644..b49957f 100644
--- 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 9fec1b7..5a1560f 100644
--- a/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
+++ b/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
@@ -1609,14 +1609,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;
--
1.7.4.1
Use kzalloc rather than kmalloc followed by memset with 0.
Found by coccinelle.
Signed-off-by: Alexander Beregalov <[email protected]>
---
drivers/staging/ft1000/ft1000-pcmcia/ft1000_cs.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_cs.c b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_cs.c
index 874919c..10af477 100644
--- a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_cs.c
+++ b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_cs.c
@@ -120,11 +120,10 @@ static int ft1000_attach(struct pcmcia_device *link)
DEBUG(0, "ft1000_cs: ft1000_attach()\n");
- local = kmalloc(sizeof(local_info_t), GFP_KERNEL);
+ local = kzalloc(sizeof(local_info_t), GFP_KERNEL);
if (!local) {
return -ENOMEM;
}
- memset(local, 0, sizeof(local_info_t));
local->link = link;
link->priv = local;
--
1.7.4.1
Use kzalloc rather than kmalloc followed by memset with 0.
Found by coccinelle.
Signed-off-by: Alexander Beregalov <[email protected]>
---
drivers/staging/rts_pstor/rtsx.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/rts_pstor/rtsx.c b/drivers/staging/rts_pstor/rtsx.c
index c3f33d1..db3470e 100644
--- a/drivers/staging/rts_pstor/rtsx.c
+++ b/drivers/staging/rts_pstor/rtsx.c
@@ -931,11 +931,10 @@ static int __devinit rtsx_probe(struct pci_dev *pci, const struct pci_device_id
dev = host_to_rtsx(host);
memset(dev, 0, sizeof(struct rtsx_dev));
- dev->chip = (struct rtsx_chip *)kmalloc(sizeof(struct rtsx_chip), GFP_KERNEL);
+ dev->chip = kzalloc(sizeof(struct rtsx_chip), GFP_KERNEL);
if (dev->chip == NULL) {
goto errout;
}
- memset(dev->chip, 0, sizeof(struct rtsx_chip));
spin_lock_init(&dev->reg_lock);
mutex_init(&(dev->dev_mutex));
--
1.7.4.1
Use kzalloc rather than kmalloc followed by memset with 0.
Found by coccinelle.
Signed-off-by: Alexander Beregalov <[email protected]>
---
drivers/staging/spectra/flash.c | 26 +++++++++-----------------
1 files changed, 9 insertions(+), 17 deletions(-)
diff --git a/drivers/staging/spectra/flash.c b/drivers/staging/spectra/flash.c
index f11197b..a2f8200 100644
--- a/drivers/staging/spectra/flash.c
+++ b/drivers/staging/spectra/flash.c
@@ -428,10 +428,9 @@ static int allocate_memory(void)
DeviceInfo.wPageDataSize;
/* Malloc memory for block tables */
- g_pBlockTable = kmalloc(block_table_size, GFP_ATOMIC);
+ g_pBlockTable = kzalloc(block_table_size, GFP_ATOMIC);
if (!g_pBlockTable)
goto block_table_fail;
- memset(g_pBlockTable, 0, block_table_size);
total_bytes += block_table_size;
g_pWearCounter = (u8 *)(g_pBlockTable +
@@ -447,19 +446,17 @@ static int allocate_memory(void)
Cache.array[i].address = NAND_CACHE_INIT_ADDR;
Cache.array[i].use_cnt = 0;
Cache.array[i].changed = CLEAR;
- Cache.array[i].buf = kmalloc(Cache.cache_item_size,
- GFP_ATOMIC);
+ Cache.array[i].buf = kzalloc(Cache.cache_item_size,
+ GFP_ATOMIC);
if (!Cache.array[i].buf)
goto cache_item_fail;
- memset(Cache.array[i].buf, 0, Cache.cache_item_size);
total_bytes += Cache.cache_item_size;
}
/* Malloc memory for IPF */
- g_pIPF = kmalloc(page_size, GFP_ATOMIC);
+ g_pIPF = kzalloc(page_size, GFP_ATOMIC);
if (!g_pIPF)
goto ipf_fail;
- memset(g_pIPF, 0, page_size);
total_bytes += page_size;
/* Malloc memory for data merging during Level2 Cache flush */
@@ -476,10 +473,9 @@ static int allocate_memory(void)
total_bytes += block_size;
/* Malloc memory for temp buffer */
- g_pTempBuf = kmalloc(Cache.cache_item_size, GFP_ATOMIC);
+ g_pTempBuf = kzalloc(Cache.cache_item_size, GFP_ATOMIC);
if (!g_pTempBuf)
goto Temp_buf_fail;
- memset(g_pTempBuf, 0, Cache.cache_item_size);
total_bytes += Cache.cache_item_size;
/* Malloc memory for block table blocks */
@@ -589,10 +585,9 @@ static int allocate_memory(void)
total_bytes += block_size;
/* Malloc memory for copy of block table used in CDMA mode */
- g_pBTStartingCopy = kmalloc(block_table_size, GFP_ATOMIC);
+ g_pBTStartingCopy = kzalloc(block_table_size, GFP_ATOMIC);
if (!g_pBTStartingCopy)
goto bt_starting_copy;
- memset(g_pBTStartingCopy, 0, block_table_size);
total_bytes += block_table_size;
g_pWearCounterCopy = (u8 *)(g_pBTStartingCopy +
@@ -608,28 +603,25 @@ static int allocate_memory(void)
5 * DeviceInfo.wDataBlockNum * sizeof(u8);
if (DeviceInfo.MLCDevice)
mem_size += 5 * DeviceInfo.wDataBlockNum * sizeof(u16);
- g_pBlockTableCopies = kmalloc(mem_size, GFP_ATOMIC);
+ g_pBlockTableCopies = kzalloc(mem_size, GFP_ATOMIC);
if (!g_pBlockTableCopies)
goto blk_table_copies_fail;
- memset(g_pBlockTableCopies, 0, mem_size);
total_bytes += mem_size;
g_pNextBlockTable = g_pBlockTableCopies;
/* Malloc memory for Block Table Delta */
mem_size = MAX_DESCS * sizeof(struct BTableChangesDelta);
- g_pBTDelta = kmalloc(mem_size, GFP_ATOMIC);
+ g_pBTDelta = kzalloc(mem_size, GFP_ATOMIC);
if (!g_pBTDelta)
goto bt_delta_fail;
- memset(g_pBTDelta, 0, mem_size);
total_bytes += mem_size;
g_pBTDelta_Free = g_pBTDelta;
/* Malloc memory for Copy Back Buffers */
for (j = 0; j < COPY_BACK_BUF_NUM; j++) {
- cp_back_buf_copies[j] = kmalloc(block_size, GFP_ATOMIC);
+ cp_back_buf_copies[j] = kzalloc(block_size, GFP_ATOMIC);
if (!cp_back_buf_copies[j])
goto cp_back_buf_copies_fail;
- memset(cp_back_buf_copies[j], 0, block_size);
total_bytes += block_size;
}
cp_back_buf_idx = 0;
--
1.7.4.1