drm/omap: cleanup fbdev init/free

omap_fbdev_init() and omap_fbdev_free() use priv->fbdev directly.
However, omap_fbdev_init() returns the fbdev, and omap_drv.c also
assigns the return value to priv->fbdev. This is slightly confusing.

Clean this up by removing the omap_fbdev_init() return value, as we
don't care whether fbdev init succeeded or not. Also change omap_drv.c
to call omap_fbdev_free() always, and omap_fbdev_free() does the check
if fbdev was initialized.

While at it, rename omap_fbdev_free() to omap_fbdev_fini() to better
match the "init" counterpart.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

1 files changed, 4 insertions, 5 deletions

diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c
index 65a567dcf3ab..4f48b908bdc6 100644
--- a/drivers/gpu/drm/omapdrm/omap_drv.c
+++ b/drivers/gpu/drm/omapdrm/omap_drv.c
@@ -570,7 +570,7 @@ static int omapdrm_init(struct omap_drm_private *priv, struct device *dev)
         for (i = 0; i < priv->num_crtcs; i++)
                 drm_crtc_vblank_off(priv->crtcs[i]);
 
-        priv->fbdev = omap_fbdev_init(ddev);
+        omap_fbdev_init(ddev);
 
         drm_kms_helper_poll_init(ddev);
         omap_modeset_enable_external_hpd();
@@ -588,8 +588,8 @@ static int omapdrm_init(struct omap_drm_private *priv, struct device *dev)
 err_cleanup_helpers:
         omap_modeset_disable_external_hpd();
         drm_kms_helper_poll_fini(ddev);
-        if (priv->fbdev)
-                omap_fbdev_free(ddev);
+
+        omap_fbdev_fini(ddev);
 err_cleanup_modeset:
         drm_mode_config_cleanup(ddev);
         omap_drm_irq_uninstall(ddev);
@@ -615,8 +615,7 @@ static void omapdrm_cleanup(struct omap_drm_private *priv)
         omap_modeset_disable_external_hpd();
         drm_kms_helper_poll_fini(ddev);
 
-        if (priv->fbdev)
-                omap_fbdev_free(ddev);
+        omap_fbdev_fini(ddev);
 
         drm_atomic_helper_shutdown(ddev);