summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAjay Kumar <ajaykumar.rs@samsung.com>2014-07-31 21:42:09 +0400
committerThierry Reding <treding@nvidia.com>2014-08-06 18:44:13 +0400
commit1a670e7b8c4227bcff5119802ef04bbf5916cabb (patch)
tree40985d6dd73d4b9b5cc9d9b029d14ec865da6a4d
parent8141028278c2eac32a70d2c5a5178c84a4d0963e (diff)
downloadlinux-1a670e7b8c4227bcff5119802ef04bbf5916cabb.tar.xz
drm/panel: s6e8aa0: 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>
-rw-r--r--drivers/gpu/drm/panel/panel-s6e8aa0.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/gpu/drm/panel/panel-s6e8aa0.c b/drivers/gpu/drm/panel/panel-s6e8aa0.c
index 31f2c87eadf6..b5217fe37f02 100644
--- a/drivers/gpu/drm/panel/panel-s6e8aa0.c
+++ b/drivers/gpu/drm/panel/panel-s6e8aa0.c
@@ -892,6 +892,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);
s6e8aa0_dcs_write_seq_static(ctx, MIPI_DCS_ENTER_SLEEP_MODE);
@@ -903,18 +908,8 @@ 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;