* [PATCH 9/20] drivers/bluetooth: Use kzalloc
@ 2010-05-13 20:02 Julia Lawall
2010-05-13 20:23 ` Gustavo F. Padovan
2010-07-08 22:01 ` Marcel Holtmann
0 siblings, 2 replies; 3+ messages in thread
From: Julia Lawall @ 2010-05-13 20:02 UTC (permalink / raw)
To: Marcel Holtmann, linux-bluetooth, linux-kernel, kernel-janitors
From: Julia Lawall <julia@diku.dk>
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@diku.dk>
---
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);
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH 9/20] drivers/bluetooth: Use kzalloc
2010-05-13 20:02 [PATCH 9/20] drivers/bluetooth: Use kzalloc Julia Lawall
@ 2010-05-13 20:23 ` Gustavo F. Padovan
2010-07-08 22:01 ` Marcel Holtmann
1 sibling, 0 replies; 3+ messages in thread
From: Gustavo F. Padovan @ 2010-05-13 20:23 UTC (permalink / raw)
To: Julia Lawall
Cc: Marcel Holtmann, linux-bluetooth, linux-kernel, kernel-janitors
* Julia Lawall <julia@diku.dk> [2010-05-13 22:02:03 +0200]:
> From: Julia Lawall <julia@diku.dk>
>
> 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@diku.dk>
>
> ---
> 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@profusion.mobi>
--
Gustavo F. Padovan
http://padovan.org
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH 9/20] drivers/bluetooth: Use kzalloc
2010-05-13 20:02 [PATCH 9/20] drivers/bluetooth: Use kzalloc Julia Lawall
2010-05-13 20:23 ` Gustavo F. Padovan
@ 2010-07-08 22:01 ` Marcel Holtmann
1 sibling, 0 replies; 3+ messages in thread
From: Marcel Holtmann @ 2010-07-08 22:01 UTC (permalink / raw)
To: Julia Lawall; +Cc: linux-bluetooth, linux-kernel, kernel-janitors
Hi Julia,
> Use kzalloc rather than the combination of kmalloc and memset.
>
patch has been applied to bluetooth-next-2.6 tree. Thanks.
Regards
Marcel
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-07-08 22:01 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-05-13 20:02 [PATCH 9/20] drivers/bluetooth: Use kzalloc Julia Lawall
2010-05-13 20:23 ` Gustavo F. Padovan
2010-07-08 22:01 ` Marcel Holtmann
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).