Skip to content

Commit 325cb83

Browse files
Uwe Kleine-Königsre
authored andcommitted
power: supply: qcom_smbb: 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> Link: https://lore.kernel.org/r/20230918133700.1254499-23-u.kleine-koenig@pengutronix.de Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
1 parent 6e3ed20 commit 325cb83

1 file changed

Lines changed: 2 additions & 4 deletions

File tree

drivers/power/supply/qcom_smbb.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1000,15 +1000,13 @@ static int smbb_charger_probe(struct platform_device *pdev)
10001000
return 0;
10011001
}
10021002

1003-
static int smbb_charger_remove(struct platform_device *pdev)
1003+
static void smbb_charger_remove(struct platform_device *pdev)
10041004
{
10051005
struct smbb_charger *chg;
10061006

10071007
chg = platform_get_drvdata(pdev);
10081008

10091009
regmap_update_bits(chg->regmap, chg->addr + SMBB_CHG_CTRL, CTRL_EN, 0);
1010-
1011-
return 0;
10121010
}
10131011

10141012
static const struct of_device_id smbb_charger_id_table[] = {
@@ -1020,7 +1018,7 @@ MODULE_DEVICE_TABLE(of, smbb_charger_id_table);
10201018

10211019
static struct platform_driver smbb_charger_driver = {
10221020
.probe = smbb_charger_probe,
1023-
.remove = smbb_charger_remove,
1021+
.remove_new = smbb_charger_remove,
10241022
.driver = {
10251023
.name = "qcom-smbb",
10261024
.of_match_table = smbb_charger_id_table,

0 commit comments

Comments
 (0)