Skip to content

Commit b0d61e8

Browse files
Uwe Kleine-Könighdeller
authored andcommitted
fbdev: omapfb/sharp-ls037v7dw01: 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 <u.kleine-koenig@pengutronix.de> Signed-off-by: Helge Deller <deller@gmx.de>
1 parent fe83fc5 commit b0d61e8

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

drivers/video/fbdev/omap2/omapfb/displays/panel-sharp-ls037v7dw01.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ static int sharp_ls_probe(struct platform_device *pdev)
292292
return r;
293293
}
294294

295-
static int sharp_ls_remove(struct platform_device *pdev)
295+
static void sharp_ls_remove(struct platform_device *pdev)
296296
{
297297
struct panel_drv_data *ddata = platform_get_drvdata(pdev);
298298
struct omap_dss_device *dssdev = &ddata->dssdev;
@@ -304,8 +304,6 @@ static int sharp_ls_remove(struct platform_device *pdev)
304304
sharp_ls_disconnect(dssdev);
305305

306306
omap_dss_put_device(in);
307-
308-
return 0;
309307
}
310308

311309
static const struct of_device_id sharp_ls_of_match[] = {
@@ -317,7 +315,7 @@ MODULE_DEVICE_TABLE(of, sharp_ls_of_match);
317315

318316
static struct platform_driver sharp_ls_driver = {
319317
.probe = sharp_ls_probe,
320-
.remove = sharp_ls_remove,
318+
.remove_new = sharp_ls_remove,
321319
.driver = {
322320
.name = "panel-sharp-ls037v7dw01",
323321
.of_match_table = sharp_ls_of_match,

0 commit comments

Comments
 (0)