10 files changed, 0 insertions, 353 deletions

diff --git a/drivers/video/omap2/displays/panel-acx565akm.c b/drivers/video/omap2/displays/panel-acx565akm.c
index c835aa70f96f..65eb76c840a1 100644
--- a/drivers/video/omap2/displays/panel-acx565akm.c
+++ b/drivers/video/omap2/displays/panel-acx565akm.c
@@ -710,27 +710,6 @@ static void acx_panel_disable(struct omap_dss_device *dssdev)
         dssdev->state = OMAP_DSS_DISPLAY_DISABLED;
 }
 
-static int acx_panel_suspend(struct omap_dss_device *dssdev)
-{
-        dev_dbg(&dssdev->dev, "%s\n", __func__);
-        acx_panel_power_off(dssdev);
-        dssdev->state = OMAP_DSS_DISPLAY_SUSPENDED;
-        return 0;
-}
-
-static int acx_panel_resume(struct omap_dss_device *dssdev)
-{
-        int r;
-
-        dev_dbg(&dssdev->dev, "%s\n", __func__);
-        r = acx_panel_power_on(dssdev);
-        if (r)
-                return r;
-
-        dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;
-        return 0;
-}
-
 static void acx_panel_set_timings(struct omap_dss_device *dssdev,
                 struct omap_video_timings *timings)
 {
@@ -752,8 +731,6 @@ static struct omap_dss_driver acx_panel_driver = {
 
         .enable         = acx_panel_enable,
         .disable        = acx_panel_disable,
-        .suspend        = acx_panel_suspend,
-        .resume         = acx_panel_resume,
 
         .set_timings    = acx_panel_set_timings,
         .check_timings  = acx_panel_check_timings,
diff --git a/drivers/video/omap2/displays/panel-generic-dpi.c b/drivers/video/omap2/displays/panel-generic-dpi.c
index 88295c526815..54ca8ae21078 100644
--- a/drivers/video/omap2/displays/panel-generic-dpi.c
+++ b/drivers/video/omap2/displays/panel-generic-dpi.c
@@ -688,40 +688,6 @@ static void generic_dpi_panel_disable(struct omap_dss_device *dssdev)
         mutex_unlock(&drv_data->lock);
 }
 
-static int generic_dpi_panel_suspend(struct omap_dss_device *dssdev)
-{
-        struct panel_drv_data *drv_data = dev_get_drvdata(&dssdev->dev);
-
-        mutex_lock(&drv_data->lock);
-
-        generic_dpi_panel_power_off(dssdev);
-
-        dssdev->state = OMAP_DSS_DISPLAY_SUSPENDED;
-
-        mutex_unlock(&drv_data->lock);
-
-        return 0;
-}
-
-static int generic_dpi_panel_resume(struct omap_dss_device *dssdev)
-{
-        struct panel_drv_data *drv_data = dev_get_drvdata(&dssdev->dev);
-        int r;
-
-        mutex_lock(&drv_data->lock);
-
-        r = generic_dpi_panel_power_on(dssdev);
-        if (r)
-                goto err;
-
-        dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;
-
-err:
-        mutex_unlock(&drv_data->lock);
-
-        return r;
-}
-
 static void generic_dpi_panel_set_timings(struct omap_dss_device *dssdev,
                 struct omap_video_timings *timings)
 {
@@ -769,8 +735,6 @@ static struct omap_dss_driver dpi_driver = {
 
         .enable         = generic_dpi_panel_enable,
         .disable        = generic_dpi_panel_disable,
-        .suspend        = generic_dpi_panel_suspend,
-        .resume         = generic_dpi_panel_resume,
 
         .set_timings    = generic_dpi_panel_set_timings,
         .get_timings    = generic_dpi_panel_get_timings,
diff --git a/drivers/video/omap2/displays/panel-lgphilips-lb035q02.c b/drivers/video/omap2/displays/panel-lgphilips-lb035q02.c
index 90c1cabf244e..ace419b801eb 100644
--- a/drivers/video/omap2/displays/panel-lgphilips-lb035q02.c
+++ b/drivers/video/omap2/displays/panel-lgphilips-lb035q02.c
@@ -143,46 +143,12 @@ static void lb035q02_panel_disable(struct omap_dss_device *dssdev)
         mutex_unlock(&ld->lock);
 }
 
-static int lb035q02_panel_suspend(struct omap_dss_device *dssdev)
-{
-        struct lb035q02_data *ld = dev_get_drvdata(&dssdev->dev);
-
-        mutex_lock(&ld->lock);
-
-        lb035q02_panel_power_off(dssdev);
-        dssdev->state = OMAP_DSS_DISPLAY_SUSPENDED;
-
-        mutex_unlock(&ld->lock);
-        return 0;
-}
-
-static int lb035q02_panel_resume(struct omap_dss_device *dssdev)
-{
-        struct lb035q02_data *ld = dev_get_drvdata(&dssdev->dev);
-        int r;
-
-        mutex_lock(&ld->lock);
-
-        r = lb035q02_panel_power_on(dssdev);
-        if (r)
-                goto err;
-        dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;
-
-        mutex_unlock(&ld->lock);
-        return 0;
-err:
-        mutex_unlock(&ld->lock);
-        return r;
-}
-
 static struct omap_dss_driver lb035q02_driver = {
         .probe          = lb035q02_panel_probe,
         .remove         = lb035q02_panel_remove,
 
         .enable         = lb035q02_panel_enable,
         .disable        = lb035q02_panel_disable,
-        .suspend        = lb035q02_panel_suspend,
-        .resume         = lb035q02_panel_resume,
 
         .driver         = {
                 .name   = "lgphilips_lb035q02_panel",
diff --git a/drivers/video/omap2/displays/panel-n8x0.c b/drivers/video/omap2/displays/panel-n8x0.c
index 3fc5ad081a21..265326955552 100644
--- a/drivers/video/omap2/displays/panel-n8x0.c
+++ b/drivers/video/omap2/displays/panel-n8x0.c
@@ -574,54 +574,6 @@ static void n8x0_panel_disable(struct omap_dss_device *dssdev)
         mutex_unlock(&ddata->lock);
 }
 
-static int n8x0_panel_suspend(struct omap_dss_device *dssdev)
-{
-        struct panel_drv_data *ddata = get_drv_data(dssdev);
-
-        dev_dbg(&dssdev->dev, "suspend\n");
-
-        mutex_lock(&ddata->lock);
-
-        rfbi_bus_lock();
-
-        n8x0_panel_power_off(dssdev);
-
-        rfbi_bus_unlock();
-
-        dssdev->state = OMAP_DSS_DISPLAY_SUSPENDED;
-
-        mutex_unlock(&ddata->lock);
-
-        return 0;
-}
-
-static int n8x0_panel_resume(struct omap_dss_device *dssdev)
-{
-        struct panel_drv_data *ddata = get_drv_data(dssdev);
-        int r;
-
-        dev_dbg(&dssdev->dev, "resume\n");
-
-        mutex_lock(&ddata->lock);
-
-        rfbi_bus_lock();
-
-        r = n8x0_panel_power_on(dssdev);
-
-        rfbi_bus_unlock();
-
-        if (r) {
-                mutex_unlock(&ddata->lock);
-                return r;
-        }
-
-        dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;
-
-        mutex_unlock(&ddata->lock);
-
-        return 0;
-}
-
 static void n8x0_panel_get_resolution(struct omap_dss_device *dssdev,
                 u16 *xres, u16 *yres)
 {
@@ -683,8 +635,6 @@ static struct omap_dss_driver n8x0_panel_driver = {
 
         .enable         = n8x0_panel_enable,
         .disable        = n8x0_panel_disable,
-        .suspend        = n8x0_panel_suspend,
-        .resume         = n8x0_panel_resume,
 
         .update         = n8x0_panel_update,
         .sync           = n8x0_panel_sync,
diff --git a/drivers/video/omap2/displays/panel-nec-nl8048hl11-01b.c b/drivers/video/omap2/displays/panel-nec-nl8048hl11-01b.c
index 908fd268f3dc..2a79c283bebe 100644
--- a/drivers/video/omap2/displays/panel-nec-nl8048hl11-01b.c
+++ b/drivers/video/omap2/displays/panel-nec-nl8048hl11-01b.c
@@ -236,28 +236,6 @@ static void nec_8048_panel_disable(struct omap_dss_device *dssdev)
         dssdev->state = OMAP_DSS_DISPLAY_DISABLED;
 }
 
-static int nec_8048_panel_suspend(struct omap_dss_device *dssdev)
-{
-        nec_8048_panel_power_off(dssdev);
-
-        dssdev->state = OMAP_DSS_DISPLAY_SUSPENDED;
-
-        return 0;
-}
-
-static int nec_8048_panel_resume(struct omap_dss_device *dssdev)
-{
-        int r;
-
-        r = nec_8048_panel_power_on(dssdev);
-        if (r)
-                return r;
-
-        dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;
-
-        return 0;
-}
-
 static int nec_8048_recommended_bpp(struct omap_dss_device *dssdev)
 {
         return 16;
@@ -268,8 +246,6 @@ static struct omap_dss_driver nec_8048_driver = {
         .remove                 = nec_8048_panel_remove,
         .enable                 = nec_8048_panel_enable,
         .disable                = nec_8048_panel_disable,
-        .suspend                = nec_8048_panel_suspend,
-        .resume                 = nec_8048_panel_resume,
         .get_recommended_bpp    = nec_8048_recommended_bpp,
 
         .driver         = {
diff --git a/drivers/video/omap2/displays/panel-picodlp.c b/drivers/video/omap2/displays/panel-picodlp.c
index 9df87640ddd2..e3a6c1996134 100644
--- a/drivers/video/omap2/displays/panel-picodlp.c
+++ b/drivers/video/omap2/displays/panel-picodlp.c
@@ -503,47 +503,6 @@ static void picodlp_panel_disable(struct omap_dss_device *dssdev)
         dev_dbg(&dssdev->dev, "disabling picodlp panel\n");
 }
 
-static int picodlp_panel_suspend(struct omap_dss_device *dssdev)
-{
-        struct picodlp_data *picod = dev_get_drvdata(&dssdev->dev);
-
-        mutex_lock(&picod->lock);
-        /* Turn off DLP Power */
-        if (dssdev->state != OMAP_DSS_DISPLAY_ACTIVE) {
-                mutex_unlock(&picod->lock);
-                dev_err(&dssdev->dev, "unable to suspend picodlp panel,"
-                                        " panel is not ACTIVE\n");
-                return -EINVAL;
-        }
-
-        picodlp_panel_power_off(dssdev);
-
-        dssdev->state = OMAP_DSS_DISPLAY_SUSPENDED;
-        mutex_unlock(&picod->lock);
-
-        dev_dbg(&dssdev->dev, "suspending picodlp panel\n");
-        return 0;
-}
-
-static int picodlp_panel_resume(struct omap_dss_device *dssdev)
-{
-        struct picodlp_data *picod = dev_get_drvdata(&dssdev->dev);
-        int r;
-
-        mutex_lock(&picod->lock);
-        if (dssdev->state != OMAP_DSS_DISPLAY_SUSPENDED) {
-                mutex_unlock(&picod->lock);
-                dev_err(&dssdev->dev, "unable to resume picodlp panel,"
-                        " panel is not ACTIVE\n");
-                return -EINVAL;
-        }
-
-        r = picodlp_panel_power_on(dssdev);
-        mutex_unlock(&picod->lock);
-        dev_dbg(&dssdev->dev, "resuming picodlp panel\n");
-        return r;
-}
-
 static void picodlp_get_resolution(struct omap_dss_device *dssdev,
                                         u16 *xres, u16 *yres)
 {
@@ -560,9 +519,6 @@ static struct omap_dss_driver picodlp_driver = {
 
         .get_resolution = picodlp_get_resolution,
 
-        .suspend        = picodlp_panel_suspend,
-        .resume         = picodlp_panel_resume,
-
         .driver         = {
                 .name   = "picodlp_panel",
                 .owner  = THIS_MODULE,
diff --git a/drivers/video/omap2/displays/panel-sharp-ls037v7dw01.c b/drivers/video/omap2/displays/panel-sharp-ls037v7dw01.c
index 1ec3b277ff15..cada8c621e01 100644
--- a/drivers/video/omap2/displays/panel-sharp-ls037v7dw01.c
+++ b/drivers/video/omap2/displays/panel-sharp-ls037v7dw01.c
@@ -194,29 +194,12 @@ static void sharp_ls_panel_disable(struct omap_dss_device *dssdev)
         dssdev->state = OMAP_DSS_DISPLAY_DISABLED;
 }
 
-static int sharp_ls_panel_suspend(struct omap_dss_device *dssdev)
-{
-        sharp_ls_power_off(dssdev);
-        dssdev->state = OMAP_DSS_DISPLAY_SUSPENDED;
-        return 0;
-}
-
-static int sharp_ls_panel_resume(struct omap_dss_device *dssdev)
-{
-        int r;
-        r = sharp_ls_power_on(dssdev);
-        dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;
-        return r;
-}
-
 static struct omap_dss_driver sharp_ls_driver = {
         .probe          = sharp_ls_panel_probe,
         .remove         = __exit_p(sharp_ls_panel_remove),
 
         .enable         = sharp_ls_panel_enable,
         .disable        = sharp_ls_panel_disable,
-        .suspend        = sharp_ls_panel_suspend,
-        .resume         = sharp_ls_panel_resume,
 
         .driver         = {
                 .name   = "sharp_ls_panel",
diff --git a/drivers/video/omap2/displays/panel-taal.c b/drivers/video/omap2/displays/panel-taal.c
index f2f644680ca8..a32407a5735a 100644
--- a/drivers/video/omap2/displays/panel-taal.c
+++ b/drivers/video/omap2/displays/panel-taal.c
@@ -1245,76 +1245,6 @@ static void taal_disable(struct omap_dss_device *dssdev)
         mutex_unlock(&td->lock);
 }
 
-static int taal_suspend(struct omap_dss_device *dssdev)
-{
-        struct taal_data *td = dev_get_drvdata(&dssdev->dev);
-        int r;
-
-        dev_dbg(&dssdev->dev, "suspend\n");
-
-        mutex_lock(&td->lock);
-
-        if (dssdev->state != OMAP_DSS_DISPLAY_ACTIVE) {
-                r = -EINVAL;
-                goto err;
-        }
-
-        taal_cancel_ulps_work(dssdev);
-        taal_cancel_esd_work(dssdev);
-
-        dsi_bus_lock(dssdev);
-
-        r = taal_wake_up(dssdev);
-        if (!r)
-                taal_power_off(dssdev);
-
-        dsi_bus_unlock(dssdev);
-
-        dssdev->state = OMAP_DSS_DISPLAY_SUSPENDED;
-
-        mutex_unlock(&td->lock);
-
-        return 0;
-err:
-        mutex_unlock(&td->lock);
-        return r;
-}
-
-static int taal_resume(struct omap_dss_device *dssdev)
-{
-        struct taal_data *td = dev_get_drvdata(&dssdev->dev);
-        int r;
-
-        dev_dbg(&dssdev->dev, "resume\n");
-
-        mutex_lock(&td->lock);
-
-        if (dssdev->state != OMAP_DSS_DISPLAY_SUSPENDED) {
-                r = -EINVAL;
-                goto err;
-        }
-
-        dsi_bus_lock(dssdev);
-
-        r = taal_power_on(dssdev);
-
-        dsi_bus_unlock(dssdev);
-
-        if (r) {
-                dssdev->state = OMAP_DSS_DISPLAY_DISABLED;
-        } else {
-                dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;
-                taal_queue_esd_work(dssdev);
-        }
-
-        mutex_unlock(&td->lock);
-
-        return r;
-err:
-        mutex_unlock(&td->lock);
-        return r;
-}
-
 static void taal_framedone_cb(int err, void *data)
 {
         struct omap_dss_device *dssdev = data;
@@ -1818,8 +1748,6 @@ static struct omap_dss_driver taal_driver = {
 
         .enable         = taal_enable,
         .disable        = taal_disable,
-        .suspend        = taal_suspend,
-        .resume         = taal_resume,
 
         .update         = taal_update,
         .sync           = taal_sync,
diff --git a/drivers/video/omap2/displays/panel-tfp410.c b/drivers/video/omap2/displays/panel-tfp410.c
index 383811cf8648..8281baafe1ef 100644
--- a/drivers/video/omap2/displays/panel-tfp410.c
+++ b/drivers/video/omap2/displays/panel-tfp410.c
@@ -189,37 +189,6 @@ static void tfp410_disable(struct omap_dss_device *dssdev)
         mutex_unlock(&ddata->lock);
 }
 
-static int tfp410_suspend(struct omap_dss_device *dssdev)
-{
-        struct panel_drv_data *ddata = dev_get_drvdata(&dssdev->dev);
-
-        mutex_lock(&ddata->lock);
-
-        tfp410_power_off(dssdev);
-
-        dssdev->state = OMAP_DSS_DISPLAY_SUSPENDED;
-
-        mutex_unlock(&ddata->lock);
-
-        return 0;
-}
-
-static int tfp410_resume(struct omap_dss_device *dssdev)
-{
-        struct panel_drv_data *ddata = dev_get_drvdata(&dssdev->dev);
-        int r;
-
-        mutex_lock(&ddata->lock);
-
-        r = tfp410_power_on(dssdev);
-        if (r == 0)
-                dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;
-
-        mutex_unlock(&ddata->lock);
-
-        return r;
-}
-
 static void tfp410_set_timings(struct omap_dss_device *dssdev,
                 struct omap_video_timings *timings)
 {
@@ -355,8 +324,6 @@ static struct omap_dss_driver tfp410_driver = {
 
         .enable         = tfp410_enable,
         .disable        = tfp410_disable,
-        .suspend        = tfp410_suspend,
-        .resume         = tfp410_resume,
 
         .set_timings    = tfp410_set_timings,
         .get_timings    = tfp410_get_timings,
diff --git a/drivers/video/omap2/displays/panel-tpo-td043mtea1.c b/drivers/video/omap2/displays/panel-tpo-td043mtea1.c
index b5e6dbc59f0a..316b3da6d2cb 100644
--- a/drivers/video/omap2/displays/panel-tpo-td043mtea1.c
+++ b/drivers/video/omap2/displays/panel-tpo-td043mtea1.c
@@ -401,24 +401,6 @@ static void tpo_td043_disable(struct omap_dss_device *dssdev)
         dssdev->state = OMAP_DSS_DISPLAY_DISABLED;
 }
 
-static int tpo_td043_suspend(struct omap_dss_device *dssdev)
-{
-        dev_dbg(&dssdev->dev, "suspend\n");
-
-        tpo_td043_disable_dss(dssdev);
-
-        dssdev->state = OMAP_DSS_DISPLAY_SUSPENDED;
-
-        return 0;
-}
-
-static int tpo_td043_resume(struct omap_dss_device *dssdev)
-{
-        dev_dbg(&dssdev->dev, "resume\n");
-
-        return tpo_td043_enable_dss(dssdev);
-}
-
 static int tpo_td043_probe(struct omap_dss_device *dssdev)
 {
         struct tpo_td043_device *tpo_td043 = dev_get_drvdata(&dssdev->dev);
@@ -500,8 +482,6 @@ static struct omap_dss_driver tpo_td043_driver = {
 
         .enable         = tpo_td043_enable,
         .disable        = tpo_td043_disable,
-        .suspend        = tpo_td043_suspend,
-        .resume         = tpo_td043_resume,
         .set_mirror     = tpo_td043_set_hmirror,
         .get_mirror     = tpo_td043_get_hmirror,