Message ID | 20180926120031.25023-1-tzimmermann@suse.de (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | [RESEND] drm/tve200: Replace drm_dev_unref with drm_dev_put | expand |
On Wed, Sep 26, 2018 at 2:00 PM Thomas Zimmermann <tzimmermann@suse.de> wrote: > This patch unifies the naming of DRM functions for reference counting > of struct drm_device. The resulting code is more aligned with the rest > of the Linux kernel interfaces. > > Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> > Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Since you are resending it, do you need help to have it applied? Yours, Linus Walleij
Hi Am 26.09.18 um 14:14 schrieb Linus Walleij: > On Wed, Sep 26, 2018 at 2:00 PM Thomas Zimmermann <tzimmermann@suse.de> wrote: > >> This patch unifies the naming of DRM functions for reference counting >> of struct drm_device. The resulting code is more aligned with the rest >> of the Linux kernel interfaces. >> >> Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> >> Reviewed-by: Linus Walleij <linus.walleij@linaro.org> > > Since you are resending it, do you need help to have it applied? Yes. Could you please help with merging the patch? Thanks. Best regards Thomas > Yours, > Linus Walleij >
diff --git a/drivers/gpu/drm/tve200/tve200_drv.c b/drivers/gpu/drm/tve200/tve200_drv.c index 72efcecb44f7..90f24b5a95b3 100644 --- a/drivers/gpu/drm/tve200/tve200_drv.c +++ b/drivers/gpu/drm/tve200/tve200_drv.c @@ -191,12 +191,12 @@ static int tve200_probe(struct platform_device *pdev) if (IS_ERR(priv->pclk)) { dev_err(dev, "unable to get PCLK\n"); ret = PTR_ERR(priv->pclk); - goto dev_unref; + goto dev_put; } ret = clk_prepare_enable(priv->pclk); if (ret) { dev_err(dev, "failed to enable PCLK\n"); - goto dev_unref; + goto dev_put; } /* This clock is for the pixels (27MHz) */ @@ -248,8 +248,8 @@ static int tve200_probe(struct platform_device *pdev) clk_disable: clk_disable_unprepare(priv->pclk); -dev_unref: - drm_dev_unref(drm); +dev_put: + drm_dev_put(drm); return ret; } @@ -263,7 +263,7 @@ static int tve200_remove(struct platform_device *pdev) drm_panel_bridge_remove(priv->bridge); drm_mode_config_cleanup(drm); clk_disable_unprepare(priv->pclk); - drm_dev_unref(drm); + drm_dev_put(drm); return 0; }