Commit 3a382772 authored by Sachin Kamat's avatar Sachin Kamat Committed by Gustavo Padovan
Browse files

Bluetooth: Use devm_kzalloc in btsdio.c file 



devm_kzalloc() eliminates the need to free memory explicitly
thereby saving some cleanup code.

Signed-off-by: default avatarSachin Kamat <sachin.kamat@linaro.org>
Acked-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
parent eb17ea3b

drivers/bluetooth/btsdio.c

+2 −6
Original line number Diff line number Diff line
@@ -304,7 +304,7 @@ static int btsdio_probe(struct sdio_func *func, 
		tuple = tuple->next;

	}



	data = kzalloc(sizeof(*data), GFP_KERNEL);

	data = devm_kzalloc(&func->dev, sizeof(*data), GFP_KERNEL);

	if (!data)

		return -ENOMEM;
@@ -315,10 +315,8 @@ static int btsdio_probe(struct sdio_func *func, 
	skb_queue_head_init(&data->txq);



	hdev = hci_alloc_dev();

	if (!hdev) {

		kfree(data);

	if (!hdev)

		return -ENOMEM;

	}



	hdev->bus = HCI_SDIO;

	hci_set_drvdata(hdev, data);
@@ -340,7 +338,6 @@ static int btsdio_probe(struct sdio_func *func, 
	err = hci_register_dev(hdev);

	if (err < 0) {

		hci_free_dev(hdev);

		kfree(data);

		return err;

	}
@@ -366,7 +363,6 @@ static void btsdio_remove(struct sdio_func *func) 
	hci_unregister_dev(hdev);



	hci_free_dev(hdev);

	kfree(data);

}



static struct sdio_driver btsdio_driver = {