mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-01 06:33:07 +00:00
Code Issues Releases Wiki Activity

drm/omap: Convert to platform remove callback returning void

Browse source 
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 omap drm 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>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Douglas Anderson <dianders@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20230507162616.1368908-35-u.kleine-koenig@pengutronix.de
This commit is contained in:
Uwe Kleine-König 2023-05-07 18:25:57 +02:00 committed by Douglas Anderson
parent e52d1282f9
commit c2807ecb52
8 changed files with 17 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drivers/gpu/drm/omapdrm/dss/dispc.c
View file

@ -4858,10 +4858,9 @@ static int dispc_probe(struct platform_device *pdev)
return component_add(&pdev->dev, &dispc_component_ops);
}
static int dispc_remove(struct platform_device *pdev)
static void dispc_remove(struct platform_device *pdev)
{
component_del(&pdev->dev, &dispc_component_ops);
return 0;
}
static __maybe_unused int dispc_runtime_suspend(struct device *dev)
@ -4913,7 +4912,7 @@ static const struct dev_pm_ops dispc_pm_ops = {
struct platform_driver omap_dispchw_driver = {
.probe = dispc_probe,
.remove = dispc_remove,
.remove_new = dispc_remove,
.driver = {
.name = "omapdss_dispc",
.pm = &dispc_pm_ops,

6
drivers/gpu/drm/omapdrm/dss/dsi.c
View file

@ -5044,7 +5044,7 @@ static int dsi_probe(struct platform_device *pdev)
return r;
}
static int dsi_remove(struct platform_device *pdev)
static void dsi_remove(struct platform_device *pdev)
{
struct dsi_data *dsi = platform_get_drvdata(pdev);
@ -5060,8 +5060,6 @@ static int dsi_remove(struct platform_device *pdev)
regulator_disable(dsi->vdds_dsi_reg);
dsi->vdds_dsi_enabled = false;
}
return 0;
}
static __maybe_unused int dsi_runtime_suspend(struct device *dev)
@ -5095,7 +5093,7 @@ static const struct dev_pm_ops dsi_pm_ops = {
struct platform_driver omap_dsihw_driver = {
.probe = dsi_probe,
.remove = dsi_remove,
.remove_new = dsi_remove,
.driver = {
.name = "omapdss_dsi",
.pm = &dsi_pm_ops,

6
drivers/gpu/drm/omapdrm/dss/dss.c
View file

@ -1532,7 +1532,7 @@ static int dss_probe(struct platform_device *pdev)
return r;
}
static int dss_remove(struct platform_device *pdev)
static void dss_remove(struct platform_device *pdev)
{
struct dss_device *dss = platform_get_drvdata(pdev);
@ -1557,8 +1557,6 @@ static int dss_remove(struct platform_device *pdev)
dss_put_clocks(dss);
kfree(dss);
return 0;
}
static void dss_shutdown(struct platform_device *pdev)
@ -1607,7 +1605,7 @@ static const struct dev_pm_ops dss_pm_ops = {
struct platform_driver omap_dsshw_driver = {
.probe = dss_probe,
.remove = dss_remove,
.remove_new = dss_remove,
.shutdown = dss_shutdown,
.driver = {
.name = "omapdss_dss",

5
drivers/gpu/drm/omapdrm/dss/hdmi4.c
View file

@ -824,7 +824,7 @@ static int hdmi4_probe(struct platform_device *pdev)
return r;
}
static int hdmi4_remove(struct platform_device *pdev)
static void hdmi4_remove(struct platform_device *pdev)
{
struct omap_hdmi *hdmi = platform_get_drvdata(pdev);
@ -835,7 +835,6 @@ static int hdmi4_remove(struct platform_device *pdev)
pm_runtime_disable(&pdev->dev);
kfree(hdmi);
return 0;
}
static const struct of_device_id hdmi_of_match[] = {
@ -845,7 +844,7 @@ static const struct of_device_id hdmi_of_match[] = {
struct platform_driver omapdss_hdmi4hw_driver = {
.probe = hdmi4_probe,
.remove = hdmi4_remove,
.remove_new = hdmi4_remove,
.driver = {
.name = "omapdss_hdmi",
.of_match_table = hdmi_of_match,

5
drivers/gpu/drm/omapdrm/dss/hdmi5.c
View file

@ -798,7 +798,7 @@ static int hdmi5_probe(struct platform_device *pdev)
return r;
}
static int hdmi5_remove(struct platform_device *pdev)
static void hdmi5_remove(struct platform_device *pdev)
{
struct omap_hdmi *hdmi = platform_get_drvdata(pdev);
@ -809,7 +809,6 @@ static int hdmi5_remove(struct platform_device *pdev)
pm_runtime_disable(&pdev->dev);
kfree(hdmi);
return 0;
}
static const struct of_device_id hdmi_of_match[] = {
@ -820,7 +819,7 @@ static const struct of_device_id hdmi_of_match[] = {
struct platform_driver omapdss_hdmi5hw_driver = {
.probe = hdmi5_probe,
.remove = hdmi5_remove,
.remove_new = hdmi5_remove,
.driver = {
.name = "omapdss_hdmi5",
.of_match_table = hdmi_of_match,

5
drivers/gpu/drm/omapdrm/dss/venc.c
View file

@ -865,7 +865,7 @@ static int venc_probe(struct platform_device *pdev)
return r;
}
static int venc_remove(struct platform_device *pdev)
static void venc_remove(struct platform_device *pdev)
{
struct venc_device *venc = platform_get_drvdata(pdev);
@ -876,7 +876,6 @@ static int venc_remove(struct platform_device *pdev)
pm_runtime_disable(&pdev->dev);
kfree(venc);
return 0;
}
static __maybe_unused int venc_runtime_suspend(struct device *dev)
@ -913,7 +912,7 @@ static const struct of_device_id venc_of_match[] = {
struct platform_driver omap_venchw_driver = {
.probe = venc_probe,
.remove = venc_remove,
.remove_new = venc_remove,
.driver = {
.name = "omapdss_venc",
.pm = &venc_pm_ops,

9
drivers/gpu/drm/omapdrm/omap_dmm_tiler.c
View file

@ -723,7 +723,7 @@ bool dmm_is_available(void)
return omap_dmm ? true : false;
}
static int omap_dmm_remove(struct platform_device *dev)
static void omap_dmm_remove(struct platform_device *dev)
{
struct tiler_block *block, *_block;
int i;
@ -763,8 +763,6 @@ static int omap_dmm_remove(struct platform_device *dev)
kfree(omap_dmm);
omap_dmm = NULL;
}
return 0;
}
static int omap_dmm_probe(struct platform_device *dev)
@ -982,8 +980,7 @@ static int omap_dmm_probe(struct platform_device *dev)
return 0;
fail:
if (omap_dmm_remove(dev))
dev_err(&dev->dev, "cleanup failed\n");
omap_dmm_remove(dev);
return ret;
}
@ -1213,7 +1210,7 @@ static const struct of_device_id dmm_of_match[] = {
struct platform_driver omap_dmm_driver = {
.probe = omap_dmm_probe,
.remove = omap_dmm_remove,
.remove_new = omap_dmm_remove,
.driver = {
.owner = THIS_MODULE,
.name = DMM_DRIVER_NAME,

6
drivers/gpu/drm/omapdrm/omap_drv.c
View file

@ -821,14 +821,12 @@ static int pdev_probe(struct platform_device *pdev)
return ret;
}
static int pdev_remove(struct platform_device *pdev)
static void pdev_remove(struct platform_device *pdev)
{
struct omap_drm_private *priv = platform_get_drvdata(pdev);
omapdrm_cleanup(priv);
kfree(priv);
return 0;
}
#ifdef CONFIG_PM_SLEEP
@ -859,7 +857,7 @@ static struct platform_driver pdev = {
.pm = &omapdrm_pm_ops,
},
.probe = pdev_probe,
.remove = pdev_remove,
.remove_new = pdev_remove,
};
static struct platform_driver * const drivers[] = {