AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2025-04-05 06:37:58 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bluetooth: Use devm_kzalloc in btmrvl_sdio.c file

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

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
This commit is contained in:
Sachin Kamat 2012-07-27 12:38:36 +05:30 committed by Gustavo Padovan
parent 4f61cb184f
commit eb17ea3b1c
1 changed files with 4 additions and 11 deletions

15
drivers/bluetooth/btmrvl_sdio.c
View File

@ -956,11 +956,9 @@ static int btmrvl_sdio_probe(struct sdio_func *func,
BT_INFO("vendor=0x%x, device=0x%x, class=%d, fn=%d", BT_INFO("vendor=0x%x, device=0x%x, class=%d, fn=%d",
id->vendor, id->device, id->class, func->num); id->vendor, id->device, id->class, func->num);
card = kzalloc(sizeof(*card), GFP_KERNEL); card = devm_kzalloc(&func->dev, sizeof(*card), GFP_KERNEL);
if (!card) { if (!card)
ret = -ENOMEM; return -ENOMEM;
goto done;
}
card->func = func; card->func = func;
@ -974,8 +972,7 @@ static int btmrvl_sdio_probe(struct sdio_func *func,
if (btmrvl_sdio_register_dev(card) < 0) { if (btmrvl_sdio_register_dev(card) < 0) {
BT_ERR("Failed to register BT device!"); BT_ERR("Failed to register BT device!");
ret = -ENODEV; return -ENODEV;
goto free_card;
} }
/* Disable the interrupts on the card */ /* Disable the interrupts on the card */
@ -1023,9 +1020,6 @@ static int btmrvl_sdio_probe(struct sdio_func *func,
btmrvl_sdio_disable_host_int(card); btmrvl_sdio_disable_host_int(card);
unreg_dev: unreg_dev:
btmrvl_sdio_unregister_dev(card); btmrvl_sdio_unregister_dev(card);
free_card:
kfree(card);
done:
return ret; return ret;
} }
@ -1047,7 +1041,6 @@ static void btmrvl_sdio_remove(struct sdio_func *func)
BT_DBG("unregester dev"); BT_DBG("unregester dev");
btmrvl_sdio_unregister_dev(card); btmrvl_sdio_unregister_dev(card);
btmrvl_remove_card(card->priv); btmrvl_remove_card(card->priv);
kfree(card);
} }
} }
} }