Skip to content

Commit

Permalink
drm/tiny: Convert to platform remove callback returning void
Browse files Browse the repository at this point in the history
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 (mostly) ignored
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.

Trivially convert the tiny drm drivers 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: Douglas Anderson <dianders@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20230507162616.1368908-50-u.kleine-koenig@pengutronix.de
  • Loading branch information
Uwe Kleine-König authored and dianders committed Jun 8, 2023
1 parent 34cdd1f commit 84e6da7
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 8 deletions.
6 changes: 2 additions & 4 deletions drivers/gpu/drm/tiny/ofdrm.c
Original file line number Diff line number Diff line change
Expand Up @@ -1369,13 +1369,11 @@ static int ofdrm_probe(struct platform_device *pdev)
return 0;
}

static int ofdrm_remove(struct platform_device *pdev)
static void ofdrm_remove(struct platform_device *pdev)
{
struct drm_device *dev = platform_get_drvdata(pdev);

drm_dev_unplug(dev);

return 0;
}

static const struct of_device_id ofdrm_of_match_display[] = {
Expand All @@ -1390,7 +1388,7 @@ static struct platform_driver ofdrm_platform_driver = {
.of_match_table = ofdrm_of_match_display,
},
.probe = ofdrm_probe,
.remove = ofdrm_remove,
.remove_new = ofdrm_remove,
};

module_platform_driver(ofdrm_platform_driver);
Expand Down
6 changes: 2 additions & 4 deletions drivers/gpu/drm/tiny/simpledrm.c
Original file line number Diff line number Diff line change
Expand Up @@ -888,14 +888,12 @@ static int simpledrm_probe(struct platform_device *pdev)
return 0;
}

static int simpledrm_remove(struct platform_device *pdev)
static void simpledrm_remove(struct platform_device *pdev)
{
struct simpledrm_device *sdev = platform_get_drvdata(pdev);
struct drm_device *dev = &sdev->dev;

drm_dev_unplug(dev);

return 0;
}

static const struct of_device_id simpledrm_of_match_table[] = {
Expand All @@ -910,7 +908,7 @@ static struct platform_driver simpledrm_platform_driver = {
.of_match_table = simpledrm_of_match_table,
},
.probe = simpledrm_probe,
.remove = simpledrm_remove,
.remove_new = simpledrm_remove,
};

module_platform_driver(simpledrm_platform_driver);
Expand Down

0 comments on commit 84e6da7

Please sign in to comment.