summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAjay Kumar <ajaykumar.rs@samsung.com>2014-07-31 17:42:08 (GMT)
committerThierry Reding <treding@nvidia.com>2014-08-06 14:44:12 (GMT)
commit8141028278c2eac32a70d2c5a5178c84a4d0963e (patch)
tree87d7c9a52d2137d4fae448f70b53e1ad6c18fa0f
parent0407ed8afe0cada72b0c28fd35c821fe3b235593 (diff)
downloadlinux-8141028278c2eac32a70d2c5a5178c84a4d0963e.tar.xz
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>
-rw-r--r--drivers/gpu/drm/panel/panel-ld9040.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/gpu/drm/panel/panel-ld9040.c b/drivers/gpu/drm/panel/panel-ld9040.c
index 9b40bd05..c6aa7f7 100644
--- a/drivers/gpu/drm/panel/panel-ld9040.c
+++ b/drivers/gpu/drm/panel/panel-ld9040.c
@@ -216,6 +216,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);
msleep(120);
@@ -228,18 +233,8 @@ 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;