From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Sender: "Gustavo F. Padovan" Date: Thu, 13 May 2010 17:23:10 -0300 From: "Gustavo F. Padovan" To: Julia Lawall Cc: Marcel Holtmann , linux-bluetooth@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: Re: [PATCH 9/20] drivers/bluetooth: Use kzalloc Message-ID: <20100513202310.GA11617@vigoh> References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii In-Reply-To: List-ID: * Julia Lawall [2010-05-13 22:02:03 +0200]: > From: Julia Lawall > > Use kzalloc rather than the combination of kmalloc and memset. > > The semantic patch that makes this change is as follows: > (http://coccinelle.lip6.fr/) > > // > @@ > expression x,size,flags; > statement S; > @@ > > -x = kmalloc(size,flags); > +x = kzalloc(size,flags); > if (x == NULL) S > -memset(x, 0, size); > // > > Signed-off-by: Julia Lawall > > --- > drivers/bluetooth/btmrvl_sdio.c | 8 ++------ > 1 file changed, 2 insertions(+), 6 deletions(-) > > diff -u -p a/drivers/bluetooth/btmrvl_sdio.c b/drivers/bluetooth/btmrvl_sdio.c > --- a/drivers/bluetooth/btmrvl_sdio.c > +++ b/drivers/bluetooth/btmrvl_sdio.c > @@ -216,7 +216,7 @@ static int btmrvl_sdio_download_helper(s > > tmphlprbufsz = ALIGN_SZ(BTM_UPLD_SIZE, BTSDIO_DMA_ALIGN); > > - tmphlprbuf = kmalloc(tmphlprbufsz, GFP_KERNEL); > + tmphlprbuf = kzalloc(tmphlprbufsz, GFP_KERNEL); > if (!tmphlprbuf) { > BT_ERR("Unable to allocate buffer for helper." > " Terminating download"); > @@ -224,8 +224,6 @@ static int btmrvl_sdio_download_helper(s > goto done; > } > > - memset(tmphlprbuf, 0, tmphlprbufsz); > - > helperbuf = (u8 *) ALIGN_ADDR(tmphlprbuf, BTSDIO_DMA_ALIGN); > > /* Perform helper data transfer */ > @@ -318,7 +316,7 @@ static int btmrvl_sdio_download_fw_w_hel > BT_DBG("Downloading FW image (%d bytes)", firmwarelen); > > tmpfwbufsz = ALIGN_SZ(BTM_UPLD_SIZE, BTSDIO_DMA_ALIGN); > - tmpfwbuf = kmalloc(tmpfwbufsz, GFP_KERNEL); > + tmpfwbuf = kzalloc(tmpfwbufsz, GFP_KERNEL); > if (!tmpfwbuf) { > BT_ERR("Unable to allocate buffer for firmware." > " Terminating download"); > @@ -326,8 +324,6 @@ static int btmrvl_sdio_download_fw_w_hel > goto done; > } > > - memset(tmpfwbuf, 0, tmpfwbufsz); > - > /* Ensure aligned firmware buffer */ > fwbuf = (u8 *) ALIGN_ADDR(tmpfwbuf, BTSDIO_DMA_ALIGN); > Acked-by: Gustavo F. Padovan -- Gustavo F. Padovan http://padovan.org