Re: [PATCH 9/20] drivers/bluetooth: Use kzalloc

[Gustavo F. Padovan]

* Julia Lawall <julia@xxxxxxx> [2010-05-13 22:02:03 +0200]:

> From: Julia Lawall <julia@xxxxxxx>
> 
> Use kzalloc rather than the combination of kmalloc and memset.
> 
> The semantic patch that makes this change is as follows:
> (http://coccinelle.lip6.fr/)
> 
> // <smpl>
> @@
> expression x,size,flags;
> statement S;
> @@
> 
> -x = kmalloc(size,flags);
> +x = kzalloc(size,flags);
>  if (x == NULL) S
> -memset(x, 0, size);
> // </smpl>
> 
> Signed-off-by: Julia Lawall <julia@xxxxxxx>
> 
> ---
>  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 <padovan@xxxxxxxxxxxxxx>

-- 
Gustavo F. Padovan
http://padovan.org
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/