Commit f4a0e6b1 authored by Alexander Beregalov's avatar Alexander Beregalov Committed by Greg Kroah-Hartman
Browse files

staging: bcm: optimize kmalloc to kzalloc 



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

Signed-off-by: default avatarAlexander Beregalov <a.beregalov@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 00b6fb2e

drivers/staging/bcm/Bcmchar.c

+1 −3
Original line number Diff line number Diff line
@@ -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);

drivers/staging/bcm/Misc.c

+2 −4
Original line number Diff line number Diff line
@@ -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;