drm/exynos: fix struct for operation callback functions to driver name

The mixer driver and hdmi driver have each operation callback functions
and they is registered to hdmi common driver. Their struct names in hdmi
common driver include display, manager and overlay. It confuses to
appear whose operation and two driver cannot register same operation
callback functions at the same time. Use their struct names to driver
name.

Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Inki Dae <inki.dae@samsung.com>

4 files changed, 62 insertions, 79 deletions

diff --git a/drivers/gpu/drm/exynos/exynos_drm_hdmi.c b/drivers/gpu/drm/exynos/exynos_drm_hdmi.c
index 14eb26b0ba1c..348048b766a9 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_hdmi.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_hdmi.c
@@ -30,9 +30,8 @@
                                         struct drm_hdmi_context, subdrv);
 
 /* these callback points shoud be set by specific drivers. */
-static struct exynos_hdmi_display_ops *hdmi_display_ops;
-static struct exynos_hdmi_manager_ops *hdmi_manager_ops;
-static struct exynos_hdmi_overlay_ops *hdmi_overlay_ops;
+static struct exynos_hdmi_ops *hdmi_ops;
+static struct exynos_mixer_ops *mixer_ops;
 
 struct drm_hdmi_context {
         struct exynos_drm_subdrv        subdrv;
@@ -40,31 +39,20 @@ struct drm_hdmi_context {
         struct exynos_drm_hdmi_context  *mixer_ctx;
 };
 
-void exynos_drm_display_ops_register(struct exynos_hdmi_display_ops
-                                        *display_ops)
+void exynos_hdmi_ops_register(struct exynos_hdmi_ops *ops)
 {
         DRM_DEBUG_KMS("%s\n", __FILE__);
 
-        if (display_ops)
-                hdmi_display_ops = display_ops;
+        if (ops)
+                hdmi_ops = ops;
 }
 
-void exynos_drm_manager_ops_register(struct exynos_hdmi_manager_ops
-                                        *manager_ops)
+void exynos_mixer_ops_register(struct exynos_mixer_ops *ops)
 {
         DRM_DEBUG_KMS("%s\n", __FILE__);
 
-        if (manager_ops)
-                hdmi_manager_ops = manager_ops;
-}
-
-void exynos_drm_overlay_ops_register(struct exynos_hdmi_overlay_ops
-                                        *overlay_ops)
-{
-        DRM_DEBUG_KMS("%s\n", __FILE__);
-
-        if (overlay_ops)
-                hdmi_overlay_ops = overlay_ops;
+        if (ops)
+                mixer_ops = ops;
 }
 
 static bool drm_hdmi_is_connected(struct device *dev)
@@ -73,8 +61,8 @@ static bool drm_hdmi_is_connected(struct device *dev)
 
         DRM_DEBUG_KMS("%s\n", __FILE__);
 
-        if (hdmi_display_ops && hdmi_display_ops->is_connected)
-                return hdmi_display_ops->is_connected(ctx->hdmi_ctx->ctx);
+        if (hdmi_ops && hdmi_ops->is_connected)
+                return hdmi_ops->is_connected(ctx->hdmi_ctx->ctx);
 
         return false;
 }
@@ -86,9 +74,9 @@ static int drm_hdmi_get_edid(struct device *dev,
 
         DRM_DEBUG_KMS("%s\n", __FILE__);
 
-        if (hdmi_display_ops && hdmi_display_ops->get_edid)
-                return hdmi_display_ops->get_edid(ctx->hdmi_ctx->ctx,
-                                connector, edid, len);
+        if (hdmi_ops && hdmi_ops->get_edid)
+                return hdmi_ops->get_edid(ctx->hdmi_ctx->ctx, connector, edid,
+                                          len);
 
         return 0;
 }
@@ -99,9 +87,8 @@ static int drm_hdmi_check_timing(struct device *dev, void *timing)
 
         DRM_DEBUG_KMS("%s\n", __FILE__);
 
-        if (hdmi_display_ops && hdmi_display_ops->check_timing)
-                return hdmi_display_ops->check_timing(ctx->hdmi_ctx->ctx,
-                                timing);
+        if (hdmi_ops && hdmi_ops->check_timing)
+                return hdmi_ops->check_timing(ctx->hdmi_ctx->ctx, timing);
 
         return 0;
 }
@@ -112,8 +99,8 @@ static int drm_hdmi_power_on(struct device *dev, int mode)
 
         DRM_DEBUG_KMS("%s\n", __FILE__);
 
-        if (hdmi_display_ops && hdmi_display_ops->power_on)
-                return hdmi_display_ops->power_on(ctx->hdmi_ctx->ctx, mode);
+        if (hdmi_ops && hdmi_ops->power_on)
+                return hdmi_ops->power_on(ctx->hdmi_ctx->ctx, mode);
 
         return 0;
 }
@@ -134,9 +121,9 @@ static int drm_hdmi_enable_vblank(struct device *subdrv_dev)
 
         DRM_DEBUG_KMS("%s\n", __FILE__);
 
-        if (hdmi_overlay_ops && hdmi_overlay_ops->enable_vblank)
-                return hdmi_overlay_ops->enable_vblank(ctx->mixer_ctx->ctx,
-                                                        manager->pipe);
+        if (mixer_ops && mixer_ops->enable_vblank)
+                return mixer_ops->enable_vblank(ctx->mixer_ctx->ctx,
+                                                manager->pipe);
 
         return 0;
 }
@@ -147,8 +134,8 @@ static void drm_hdmi_disable_vblank(struct device *subdrv_dev)
 
         DRM_DEBUG_KMS("%s\n", __FILE__);
 
-        if (hdmi_overlay_ops && hdmi_overlay_ops->disable_vblank)
-                return hdmi_overlay_ops->disable_vblank(ctx->mixer_ctx->ctx);
+        if (mixer_ops && mixer_ops->disable_vblank)
+                return mixer_ops->disable_vblank(ctx->mixer_ctx->ctx);
 }
 
 static void drm_hdmi_mode_fixup(struct device *subdrv_dev,
@@ -160,9 +147,9 @@ static void drm_hdmi_mode_fixup(struct device *subdrv_dev,
 
         DRM_DEBUG_KMS("%s\n", __FILE__);
 
-        if (hdmi_manager_ops && hdmi_manager_ops->mode_fixup)
-                hdmi_manager_ops->mode_fixup(ctx->hdmi_ctx->ctx, connector,
-                                                mode, adjusted_mode);
+        if (hdmi_ops && hdmi_ops->mode_fixup)
+                hdmi_ops->mode_fixup(ctx->hdmi_ctx->ctx, connector, mode,
+                                     adjusted_mode);
 }
 
 static void drm_hdmi_mode_set(struct device *subdrv_dev, void *mode)
@@ -171,8 +158,8 @@ static void drm_hdmi_mode_set(struct device *subdrv_dev, void *mode)
 
         DRM_DEBUG_KMS("%s\n", __FILE__);
 
-        if (hdmi_manager_ops && hdmi_manager_ops->mode_set)
-                hdmi_manager_ops->mode_set(ctx->hdmi_ctx->ctx, mode);
+        if (hdmi_ops && hdmi_ops->mode_set)
+                hdmi_ops->mode_set(ctx->hdmi_ctx->ctx, mode);
 }
 
 static void drm_hdmi_get_max_resol(struct device *subdrv_dev,
@@ -182,9 +169,8 @@ static void drm_hdmi_get_max_resol(struct device *subdrv_dev,
 
         DRM_DEBUG_KMS("%s\n", __FILE__);
 
-        if (hdmi_manager_ops && hdmi_manager_ops->get_max_resol)
+        if (hdmi_ops && hdmi_ops->get_max_resol)