Skip to content

Commit 536a0ad

Browse files
Uwe Kleine-KönigVudentz
authored andcommitted
Bluetooth: hci_bcm: Convert to platform remove callback returning void
The .remove() callback for a platform driver returns an int which makes many driver authors wrongly assume it's possible to do error handling by returning an error code. However the value returned is ignored (apart from emitting a warning) and this typically results in resource leaks. To improve here there is a quest to make the remove callback return void. In the first step of this quest all drivers are converted to .remove_new(), which already returns void. Eventually after all drivers are converted, .remove_new() will be renamed to .remove(). Trivially convert this driver from always returning zero in the remove callback to the void returning variant. Signed-off-by: Uwe Kleine-König <[email protected]> Signed-off-by: Luiz Augusto von Dentz <[email protected]>
1 parent 4a62832 commit 536a0ad

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

drivers/bluetooth/hci_bcm.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1293,7 +1293,7 @@ static int bcm_probe(struct platform_device *pdev)
12931293
return 0;
12941294
}
12951295

1296-
static int bcm_remove(struct platform_device *pdev)
1296+
static void bcm_remove(struct platform_device *pdev)
12971297
{
12981298
struct bcm_device *dev = platform_get_drvdata(pdev);
12991299

@@ -1302,8 +1302,6 @@ static int bcm_remove(struct platform_device *pdev)
13021302
mutex_unlock(&bcm_device_lock);
13031303

13041304
dev_info(&pdev->dev, "%s device unregistered.\n", dev->name);
1305-
1306-
return 0;
13071305
}
13081306

13091307
static const struct hci_uart_proto bcm_proto = {
@@ -1509,7 +1507,7 @@ static const struct dev_pm_ops bcm_pm_ops = {
15091507

15101508
static struct platform_driver bcm_driver = {
15111509
.probe = bcm_probe,
1512-
.remove = bcm_remove,
1510+
.remove_new = bcm_remove,
15131511
.driver = {
15141512
.name = "hci_bcm",
15151513
.acpi_match_table = ACPI_PTR(bcm_acpi_match),

0 commit comments

Comments
 (0)