Skip to content

Commit

Permalink
staging: bcm: optimize kmalloc to kzalloc
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Alexander Beregalov authored and Greg Kroah-Hartman committed Mar 9, 2011
1 parent 00b6fb2 commit f4a0e6b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 7 deletions.
4 changes: 1 addition & 3 deletions drivers/staging/bcm/Bcmchar.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
6 changes: 2 additions & 4 deletions drivers/staging/bcm/Misc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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...");
Expand All @@ -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;
Expand Down

0 comments on commit f4a0e6b

Please sign in to comment.