Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f8df39f1 authored by Julia Lawall's avatar Julia Lawall Committed by Marcel Holtmann
Browse files

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: default avatarJulia Lawall <julia@diku.dk>
Acked-by: default avatarGustavo F. Padovan <padovan@profusion.mobi>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 5ee283c0

drivers/bluetooth/btmrvl_sdio.c

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