Skip to content

Commit da21ff3

Browse files
Uwe Kleine-Könighdeller
authored andcommitted
fbdev: omapfb/dsi-cm: 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 d5d8b9d commit da21ff3

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

drivers/video/fbdev/omap2/omapfb/displays/panel-dsi-cm.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1241,7 +1241,7 @@ static int dsicm_probe(struct platform_device *pdev)
12411241
return r;
12421242
}
12431243

1244-
static int dsicm_remove(struct platform_device *pdev)
1244+
static void dsicm_remove(struct platform_device *pdev)
12451245
{
12461246
struct panel_drv_data *ddata = platform_get_drvdata(pdev);
12471247
struct omap_dss_device *dssdev = &ddata->dssdev;
@@ -1269,8 +1269,6 @@ static int dsicm_remove(struct platform_device *pdev)
12691269

12701270
/* reset, to be sure that the panel is in a valid state */
12711271
dsicm_hw_reset(ddata);
1272-
1273-
return 0;
12741272
}
12751273

12761274
static const struct of_device_id dsicm_of_match[] = {
@@ -1282,7 +1280,7 @@ MODULE_DEVICE_TABLE(of, dsicm_of_match);
12821280

12831281
static struct platform_driver dsicm_driver = {
12841282
.probe = dsicm_probe,
1285-
.remove = dsicm_remove,
1283+
.remove_new = dsicm_remove,
12861284
.driver = {
12871285
.name = "panel-dsi-cm",
12881286
.of_match_table = dsicm_of_match,

0 commit comments

Comments
 (0)