Skip to content

Commit b2da7e2

Browse files
Uwe Kleine-Königchanwoochoi
authored andcommitted
extcon: adc-jack: 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. LinkL: https://lore.kernel.org/lkml/14d30788ecd288b1b0983a8ea224499bbaa5de19.1708876186.git.u.kleine-koenig@pengutronix.de/ Signed-off-by: Uwe Kleine-König <[email protected]> Signed-off-by: Chanwoo Choi <[email protected]>
1 parent b1a8804 commit b2da7e2

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

drivers/extcon/extcon-adc-jack.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -158,14 +158,12 @@ static int adc_jack_probe(struct platform_device *pdev)
158158
return 0;
159159
}
160160

161-
static int adc_jack_remove(struct platform_device *pdev)
161+
static void adc_jack_remove(struct platform_device *pdev)
162162
{
163163
struct adc_jack_data *data = platform_get_drvdata(pdev);
164164

165165
free_irq(data->irq, data);
166166
cancel_work_sync(&data->handler.work);
167-
168-
return 0;
169167
}
170168

171169
#ifdef CONFIG_PM_SLEEP
@@ -196,7 +194,7 @@ static SIMPLE_DEV_PM_OPS(adc_jack_pm_ops,
196194

197195
static struct platform_driver adc_jack_driver = {
198196
.probe = adc_jack_probe,
199-
.remove = adc_jack_remove,
197+
.remove_new = adc_jack_remove,
200198
.driver = {
201199
.name = "adc-jack",
202200
.pm = &adc_jack_pm_ops,

0 commit comments

Comments
 (0)