Commit 536a0ad6 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Luiz Augusto von Dentz

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: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
parent 4a62832f
...@@ -1293,7 +1293,7 @@ static int bcm_probe(struct platform_device *pdev) ...@@ -1293,7 +1293,7 @@ static int bcm_probe(struct platform_device *pdev)
return 0; return 0;
} }
static int bcm_remove(struct platform_device *pdev) static void bcm_remove(struct platform_device *pdev)
{ {
struct bcm_device *dev = platform_get_drvdata(pdev); struct bcm_device *dev = platform_get_drvdata(pdev);
...@@ -1302,8 +1302,6 @@ static int bcm_remove(struct platform_device *pdev) ...@@ -1302,8 +1302,6 @@ static int bcm_remove(struct platform_device *pdev)
mutex_unlock(&bcm_device_lock); mutex_unlock(&bcm_device_lock);
dev_info(&pdev->dev, "%s device unregistered.\n", dev->name); dev_info(&pdev->dev, "%s device unregistered.\n", dev->name);
return 0;
} }
static const struct hci_uart_proto bcm_proto = { static const struct hci_uart_proto bcm_proto = {
...@@ -1509,7 +1507,7 @@ static const struct dev_pm_ops bcm_pm_ops = { ...@@ -1509,7 +1507,7 @@ static const struct dev_pm_ops bcm_pm_ops = {
static struct platform_driver bcm_driver = { static struct platform_driver bcm_driver = {
.probe = bcm_probe, .probe = bcm_probe,
.remove = bcm_remove, .remove_new = bcm_remove,
.driver = { .driver = {
.name = "hci_bcm", .name = "hci_bcm",
.acpi_match_table = ACPI_PTR(bcm_acpi_match), .acpi_match_table = ACPI_PTR(bcm_acpi_match),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment