iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/mcde: More devm_drm_dev_init

Browse Source 
Auto-unwind ftw, now possible with the fixed drm_device related
management.

Aside, clk/regulator seem to be missing devm versions for a bunch of
functions, preventing a pile of these simpler drivers from outright
losing their ->remove hook.

Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20200323144950.3018436-34-daniel.vetter@ffwll.ch
This commit is contained in:
Daniel Vetter 2020-03-23 15:49:32 +01:00
parent 4b055ab137
commit 90c2e13bc3
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/gpu/drm/mcde/mcde_drv.c
View File

@ -312,7 +312,7 @@ static int mcde_probe(struct platform_device *pdev)
return -ENOMEM; return -ENOMEM;
mcde->dev = dev; mcde->dev = dev;
ret = drm_dev_init(&mcde->drm, &mcde_drm_driver, dev); ret = devm_drm_dev_init(dev, &mcde->drm, &mcde_drm_driver);
if (ret) { if (ret) {
kfree(mcde); kfree(mcde);
return ret; return ret;
@ -331,12 +331,12 @@ static int mcde_probe(struct platform_device *pdev)
if (IS_ERR(mcde->epod)) { if (IS_ERR(mcde->epod)) {
ret = PTR_ERR(mcde->epod); ret = PTR_ERR(mcde->epod);
dev_err(dev, "can't get EPOD regulator\n"); dev_err(dev, "can't get EPOD regulator\n");
goto dev_unref; return ret;
} }
ret = regulator_enable(mcde->epod); ret = regulator_enable(mcde->epod);
if (ret) { if (ret) {
dev_err(dev, "can't enable EPOD regulator\n"); dev_err(dev, "can't enable EPOD regulator\n");
goto dev_unref; return ret;
} }
mcde->vana = devm_regulator_get(dev, "vana"); mcde->vana = devm_regulator_get(dev, "vana");
if (IS_ERR(mcde->vana)) { if (IS_ERR(mcde->vana)) {
@ -487,8 +487,6 @@ regulator_off:
regulator_disable(mcde->vana); regulator_disable(mcde->vana);
regulator_epod_off: regulator_epod_off:
regulator_disable(mcde->epod); regulator_disable(mcde->epod);
dev_unref:
drm_dev_put(drm);
return ret; return ret;
} }
@ -502,7 +500,6 @@ static int mcde_remove(struct platform_device *pdev)
clk_disable_unprepare(mcde->mcde_clk); clk_disable_unprepare(mcde->mcde_clk);
regulator_disable(mcde->vana); regulator_disable(mcde->vana);
regulator_disable(mcde->epod); regulator_disable(mcde->epod);
drm_dev_put(drm);
return 0; return 0;
} }