Skip to content

Commit f6f14e4

Browse files
Uwe Kleine-Königdtor
authored andcommitted
Input: pcap_ts - 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]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Dmitry Torokhov <[email protected]>
1 parent 02fd95e commit f6f14e4

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

drivers/input/touchscreen/pcap_ts.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ static int pcap_ts_probe(struct platform_device *pdev)
197197
return err;
198198
}
199199

200-
static int pcap_ts_remove(struct platform_device *pdev)
200+
static void pcap_ts_remove(struct platform_device *pdev)
201201
{
202202
struct pcap_ts *pcap_ts = platform_get_drvdata(pdev);
203203

@@ -207,8 +207,6 @@ static int pcap_ts_remove(struct platform_device *pdev)
207207
input_unregister_device(pcap_ts->input);
208208

209209
kfree(pcap_ts);
210-
211-
return 0;
212210
}
213211

214212
#ifdef CONFIG_PM
@@ -240,7 +238,7 @@ static const struct dev_pm_ops pcap_ts_pm_ops = {
240238

241239
static struct platform_driver pcap_ts_driver = {
242240
.probe = pcap_ts_probe,
243-
.remove = pcap_ts_remove,
241+
.remove_new = pcap_ts_remove,
244242
.driver = {
245243
.name = "pcap-ts",
246244
.pm = PCAP_TS_PM_OPS,

0 commit comments

Comments
 (0)