Commit f9760772 authored by Thomas Zimmermann's avatar Thomas Zimmermann Committed by Eric Anholt

drm/pl111: Replace drm_dev_unref with drm_dev_put

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: default avatarThomas Zimmermann <tzimmermann@suse.de>
Signed-off-by: default avatarEric Anholt <eric@anholt.net>
Link: https://patchwork.freedesktop.org/patch/msgid/20180717083657.16262-1-tzimmermann@suse.de
parent a708edf1
...@@ -304,13 +304,14 @@ static int pl111_amba_probe(struct amba_device *amba_dev, ...@@ -304,13 +304,14 @@ static int pl111_amba_probe(struct amba_device *amba_dev,
if (IS_ERR(priv->regs)) { if (IS_ERR(priv->regs)) {
dev_err(dev, "%s failed mmio\n", __func__); dev_err(dev, "%s failed mmio\n", __func__);
ret = PTR_ERR(priv->regs); ret = PTR_ERR(priv->regs);
goto dev_unref; goto dev_put;
} }
/* This may override some variant settings */ /* This may override some variant settings */
ret = pl111_versatile_init(dev, priv); ret = pl111_versatile_init(dev, priv);
if (ret) if (ret)
goto dev_unref; goto dev_put;
pl111_nomadik_init(dev); pl111_nomadik_init(dev);
/* turn off interrupts before requesting the irq */ /* turn off interrupts before requesting the irq */
...@@ -325,16 +326,16 @@ static int pl111_amba_probe(struct amba_device *amba_dev, ...@@ -325,16 +326,16 @@ static int pl111_amba_probe(struct amba_device *amba_dev,
ret = pl111_modeset_init(drm); ret = pl111_modeset_init(drm);
if (ret != 0) if (ret != 0)
goto dev_unref; goto dev_put;
ret = drm_dev_register(drm, 0); ret = drm_dev_register(drm, 0);
if (ret < 0) if (ret < 0)
goto dev_unref; goto dev_put;
return 0; return 0;
dev_unref: dev_put:
drm_dev_unref(drm); drm_dev_put(drm);
of_reserved_mem_device_release(dev); of_reserved_mem_device_release(dev);
return ret; return ret;
...@@ -351,7 +352,7 @@ static int pl111_amba_remove(struct amba_device *amba_dev) ...@@ -351,7 +352,7 @@ static int pl111_amba_remove(struct amba_device *amba_dev)
if (priv->panel) if (priv->panel)
drm_panel_bridge_remove(priv->bridge); drm_panel_bridge_remove(priv->bridge);
drm_mode_config_cleanup(drm); drm_mode_config_cleanup(drm);
drm_dev_unref(drm); drm_dev_put(drm);
of_reserved_mem_device_release(dev); of_reserved_mem_device_release(dev);
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment