]> git.openfabrics.org - ~emulex/infiniband.git/commitdiff
drm/panel: s6e8aa0: Add proper definition for prepare and unprepare
authorAjay Kumar <ajaykumar.rs@samsung.com>
Thu, 31 Jul 2014 17:42:09 +0000 (23:12 +0530)
committerThierry Reding <treding@nvidia.com>
Wed, 6 Aug 2014 14:44:13 +0000 (16:44 +0200)
Move out code from enable and disable routines to prepare
and unprepare routines, so that functionality is properly
distributed across all the panel functions.

Signed-off-by: Ajay Kumar <ajaykumar.rs@samsung.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
drivers/gpu/drm/panel/panel-s6e8aa0.c

index 31f2c87eadf699be34a8d5bb7635bc5f60c62e68..b5217fe37f02742e87df986280fb69c2097bead9 100644 (file)
@@ -891,6 +891,11 @@ static int s6e8aa0_power_off(struct s6e8aa0 *ctx)
 }
 
 static int s6e8aa0_disable(struct drm_panel *panel)
+{
+       return 0;
+}
+
+static int s6e8aa0_unprepare(struct drm_panel *panel)
 {
        struct s6e8aa0 *ctx = panel_to_s6e8aa0(panel);
 
@@ -903,17 +908,7 @@ static int s6e8aa0_disable(struct drm_panel *panel)
        return s6e8aa0_power_off(ctx);
 }
 
-static int s6e8aa0_unprepare(struct drm_panel *panel)
-{
-       return 0;
-}
-
 static int s6e8aa0_prepare(struct drm_panel *panel)
-{
-       return 0;
-}
-
-static int s6e8aa0_enable(struct drm_panel *panel)
 {
        struct s6e8aa0 *ctx = panel_to_s6e8aa0(panel);
        int ret;
@@ -926,11 +921,16 @@ static int s6e8aa0_enable(struct drm_panel *panel)
        ret = ctx->error;
 
        if (ret < 0)
-               s6e8aa0_disable(panel);
+               s6e8aa0_unprepare(panel);
 
        return ret;
 }
 
+static int s6e8aa0_enable(struct drm_panel *panel)
+{
+       return 0;
+}
+
 static int s6e8aa0_get_modes(struct drm_panel *panel)
 {
        struct drm_connector *connector = panel->connector;