summaryrefslogtreecommitdiffstats
path: root/drivers/staging/bcm
diff options
context:
space:
mode:
authorAlexander Beregalov <a.beregalov@gmail.com>2011-03-09 03:53:34 +0300
committerGreg Kroah-Hartman <gregkh@suse.de>2011-03-09 15:54:31 -0800
commitf4a0e6b1354cd0bec6aca405883cc45662511f03 (patch)
treebfc9d55f878ffa36ccef59fab3126a33cd01c458 /drivers/staging/bcm
parent00b6fb2e31ac668795857c9609adc11e7964ed5a (diff)
downloadlinux-stable-f4a0e6b1354cd0bec6aca405883cc45662511f03.tar.gz
linux-stable-f4a0e6b1354cd0bec6aca405883cc45662511f03.tar.bz2
linux-stable-f4a0e6b1354cd0bec6aca405883cc45662511f03.zip
staging: bcm: 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>
Diffstat (limited to 'drivers/staging/bcm')
-rw-r--r--drivers/staging/bcm/Bcmchar.c4
-rw-r--r--drivers/staging/bcm/Misc.c6
2 files changed, 3 insertions, 7 deletions
diff --git a/drivers/staging/bcm/Bcmchar.c b/drivers/staging/bcm/Bcmchar.c
index 3d9055aec97c..867dbf1c9926 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 f585aae9cf8b..d624f35d0551 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;