From: Ajay Kumar <ajaykumar.rs@samsung.com>
Date: Thu, 31 Jul 2014 17:42:08 +0000 (+0530)
Subject: drm/panel: ld9040: Add proper definition for prepare and unprepare
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=8141028278c2eac32a70d2c5a5178c84a4d0963e;p=deliverable%2Flinux.git

drm/panel: ld9040: Add proper definition for prepare and unprepare

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>
---

diff --git a/drivers/gpu/drm/panel/panel-ld9040.c b/drivers/gpu/drm/panel/panel-ld9040.c
index 9b40bd05d64d..c6aa7f717fa4 100644
--- a/drivers/gpu/drm/panel/panel-ld9040.c
+++ b/drivers/gpu/drm/panel/panel-ld9040.c
@@ -215,6 +215,11 @@ static int ld9040_power_off(struct ld9040 *ctx)
 }
 
 static int ld9040_disable(struct drm_panel *panel)
+{
+	return 0;
+}
+
+static int ld9040_unprepare(struct drm_panel *panel)
 {
 	struct ld9040 *ctx = panel_to_ld9040(panel);
 
@@ -228,17 +233,7 @@ static int ld9040_disable(struct drm_panel *panel)
 	return ld9040_power_off(ctx);
 }
 
-static int ld9040_unprepare(struct drm_panel *panel)
-{
-	return 0;
-}
-
 static int ld9040_prepare(struct drm_panel *panel)
-{
-	return 0;
-}
-
-static int ld9040_enable(struct drm_panel *panel)
 {
 	struct ld9040 *ctx = panel_to_ld9040(panel);
 	int ret;
@@ -252,11 +247,16 @@ static int ld9040_enable(struct drm_panel *panel)
 	ret = ld9040_clear_error(ctx);
 
 	if (ret < 0)
-		ld9040_disable(panel);
+		ld9040_unprepare(panel);
 
 	return ret;
 }
 
+static int ld9040_enable(struct drm_panel *panel)
+{
+	return 0;
+}
+
 static int ld9040_get_modes(struct drm_panel *panel)
 {
 	struct drm_connector *connector = panel->connector;