summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2023-05-18 01:02:33 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2023-05-28 12:38:02 +0100
commitef0a3642b320c96adfd7951db35f7f0a0a535d39 (patch)
treefc129e6c727d6abf34c541745e2c4c10f5f262fc
parent08cfceeeea1eebfe70b02d8f411398347a9a711d (diff)
usb: typec: intel_pmc_mux: 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() is 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 <u.kleine-koenig@pengutronix.de> Acked-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> Link: https://lore.kernel.org/r/20230517230239.187727-92-u.kleine-koenig@pengutronix.de Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/usb/typec/mux/intel_pmc_mux.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/usb/typec/mux/intel_pmc_mux.c b/drivers/usb/typec/mux/intel_pmc_mux.c
index 34e4188a40ff..e049eadb591e 100644
--- a/drivers/usb/typec/mux/intel_pmc_mux.c
+++ b/drivers/usb/typec/mux/intel_pmc_mux.c
@@ -706,7 +706,7 @@ err_remove_ports:
return ret;
}
-static int pmc_usb_remove(struct platform_device *pdev)
+static void pmc_usb_remove(struct platform_device *pdev)
{
struct pmc_usb *pmc = platform_get_drvdata(pdev);
int i;
@@ -718,8 +718,6 @@ static int pmc_usb_remove(struct platform_device *pdev)
}
acpi_dev_put(pmc->iom_adev);
-
- return 0;
}
static const struct acpi_device_id pmc_usb_acpi_ids[] = {
@@ -734,7 +732,7 @@ static struct platform_driver pmc_usb_driver = {
.acpi_match_table = ACPI_PTR(pmc_usb_acpi_ids),
},
.probe = pmc_usb_probe,
- .remove = pmc_usb_remove,
+ .remove_new = pmc_usb_remove,
};
module_platform_driver(pmc_usb_driver);