1 files changed, 15 insertions, 67 deletions

diff --git a/drivers/video/omap2/dss/hdmi_panel.c b/drivers/video/omap2/dss/hdmi_panel.c
index 69fb115bab32..dfb8eda81b61 100644
--- a/drivers/video/omap2/dss/hdmi_panel.c
+++ b/drivers/video/omap2/dss/hdmi_panel.c
@@ -280,58 +280,6 @@ static void hdmi_panel_disable(struct omap_dss_device *dssdev)
         mutex_unlock(&hdmi.lock);
 }
 
-static int hdmi_panel_suspend(struct omap_dss_device *dssdev)
-{
-        int r = 0;
-
-        mutex_lock(&hdmi.lock);
-
-        if (dssdev->state != OMAP_DSS_DISPLAY_ACTIVE) {
-                r = -EINVAL;
-                goto err;
-        }
-
-        /*
-         * TODO: notify audio users that the display was suspended. For now,
-         * disable audio locally to not break our audio state machine.
-         */
-        hdmi_panel_audio_disable(dssdev);
-
-        dssdev->state = OMAP_DSS_DISPLAY_SUSPENDED;
-        omapdss_hdmi_display_disable(dssdev);
-
-err:
-        mutex_unlock(&hdmi.lock);
-
-        return r;
-}
-
-static int hdmi_panel_resume(struct omap_dss_device *dssdev)
-{
-        int r = 0;
-
-        mutex_lock(&hdmi.lock);
-
-        if (dssdev->state != OMAP_DSS_DISPLAY_SUSPENDED) {
-                r = -EINVAL;
-                goto err;
-        }
-
-        r = omapdss_hdmi_display_enable(dssdev);
-        if (r) {
-                DSSERR("failed to power on\n");
-                goto err;
-        }
-        /* TODO: notify audio users that the panel resumed. */
-
-        dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;
-
-err:
-        mutex_unlock(&hdmi.lock);
-
-        return r;
-}
-
 static void hdmi_get_timings(struct omap_dss_device *dssdev,
                         struct omap_video_timings *timings)
 {
@@ -379,20 +327,22 @@ static int hdmi_check_timings(struct omap_dss_device *dssdev,
 static int hdmi_read_edid(struct omap_dss_device *dssdev, u8 *buf, int len)
 {
         int r;
+        bool need_enable;
 
         mutex_lock(&hdmi.lock);
 
-        if (dssdev->state != OMAP_DSS_DISPLAY_ACTIVE) {
-                r = omapdss_hdmi_display_enable(dssdev);
+        need_enable = dssdev->state == OMAP_DSS_DISPLAY_DISABLED;
+
+        if (need_enable) {
+                r = omapdss_hdmi_core_enable(dssdev);
                 if (r)
                         goto err;
         }
 
         r = omapdss_hdmi_read_edid(buf, len);
 
-        if (dssdev->state == OMAP_DSS_DISPLAY_DISABLED ||
-                        dssdev->state == OMAP_DSS_DISPLAY_SUSPENDED)
-                omapdss_hdmi_display_disable(dssdev);
+        if (need_enable)
+                omapdss_hdmi_core_disable(dssdev);
 err:
         mutex_unlock(&hdmi.lock);
 
@@ -402,20 +352,22 @@ err:
 static bool hdmi_detect(struct omap_dss_device *dssdev)
 {
         int r;
+        bool need_enable;
 
         mutex_lock(&hdmi.lock);
 
-        if (dssdev->state != OMAP_DSS_DISPLAY_ACTIVE) {
-                r = omapdss_hdmi_display_enable(dssdev);
+        need_enable = dssdev->state == OMAP_DSS_DISPLAY_DISABLED;
+
+        if (need_enable) {
+                r = omapdss_hdmi_core_enable(dssdev);
                 if (r)
                         goto err;
         }
 
         r = omapdss_hdmi_detect();
 
-        if (dssdev->state == OMAP_DSS_DISPLAY_DISABLED ||
-                        dssdev->state == OMAP_DSS_DISPLAY_SUSPENDED)
-                omapdss_hdmi_display_disable(dssdev);
+        if (need_enable)
+                omapdss_hdmi_core_disable(dssdev);
 err:
         mutex_unlock(&hdmi.lock);
 
@@ -427,8 +379,6 @@ static struct omap_dss_driver hdmi_driver = {
         .remove         = hdmi_panel_remove,
         .enable         = hdmi_panel_enable,
         .disable        = hdmi_panel_disable,
-        .suspend        = hdmi_panel_suspend,
-        .resume         = hdmi_panel_resume,
         .get_timings    = hdmi_get_timings,
         .set_timings    = hdmi_set_timings,
         .check_timings  = hdmi_check_timings,
@@ -454,9 +404,7 @@ int hdmi_panel_init(void)
         spin_lock_init(&hdmi.audio_lock);
 #endif
 
-        omap_dss_register_driver(&hdmi_driver);
-
-        return 0;
+        return omap_dss_register_driver(&hdmi_driver);
 }
 
 void hdmi_panel_exit(void)