Bluetooth: Use kzalloc for drivers

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>
Acked-by: Gustavo F. Padovan <padovan@profusion.mobi>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

diff --git a/drivers/bluetooth/btmrvl_sdio.c b/drivers/bluetooth/btmrvl_sdio.c
index 182e55345d6a28569786b358bfbfdce09cefc681..dcc2a6ec23f00eb191bda5047387de18eb71d923 100644 (file)
--- a/drivers/bluetooth/btmrvl_sdio.c
+++ b/drivers/bluetooth/btmrvl_sdio.c
@@ -217,7 +217,7 @@ static int btmrvl_sdio_download_helper(struct btmrvl_sdio_card *card)
 
        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");
@@ -225,8 +225,6 @@ static int btmrvl_sdio_download_helper(struct btmrvl_sdio_card *card)
                goto done;
        }
 
-       memset(tmphlprbuf, 0, tmphlprbufsz);
-
        helperbuf = (u8 *) ALIGN_ADDR(tmphlprbuf, BTSDIO_DMA_ALIGN);
 
        /* Perform helper data transfer */
@@ -319,7 +317,7 @@ static int btmrvl_sdio_download_fw_w_helper(struct btmrvl_sdio_card *card)
        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");
@@ -327,8 +325,6 @@ static int btmrvl_sdio_download_fw_w_helper(struct btmrvl_sdio_card *card)
                goto done;
        }
 
-       memset(tmpfwbuf, 0, tmpfwbufsz);
-
        /* Ensure aligned firmware buffer */
        fwbuf = (u8 *) ALIGN_ADDR(tmpfwbuf, BTSDIO_DMA_ALIGN);