3 files changed, 10 insertions, 31 deletions

diff --git a/drivers/video/omap2/displays/panel-taal.c b/drivers/video/omap2/displays/panel-taal.c
index 5f78d3851d91..4d644497431d 100644
--- a/drivers/video/omap2/displays/panel-taal.c
+++ b/drivers/video/omap2/displays/panel-taal.c
@@ -797,16 +797,20 @@ static int taal_mirror(struct omap_dss_device *dssdev, bool enable)
 
         dev_dbg(&dssdev->dev, "mirror %d\n", enable);
 
+        dsi_bus_lock();
         if (td->enabled) {
                 r = taal_set_addr_mode(td->rotate, enable);
-
                 if (r)
-                        return r;
+                        goto err;
         }
 
         td->mirror = enable;
 
+        dsi_bus_unlock();
         return 0;
+err:
+        dsi_bus_unlock();
+        return r;
 }
 
 static bool taal_get_mirror(struct omap_dss_device *dssdev)
diff --git a/drivers/video/omap2/dss/display.c b/drivers/video/omap2/dss/display.c
index 3f345b8cbcb0..8b9179668f48 100644
--- a/drivers/video/omap2/dss/display.c
+++ b/drivers/video/omap2/dss/display.c
@@ -215,9 +215,9 @@ static ssize_t display_mirror_show(struct device *dev,
 {
         struct omap_dss_device *dssdev = to_dss_device(dev);
         int mirror;
-        if (!dssdev->get_mirror)
+        if (!dssdev->driver->get_mirror)
                 return -ENOENT;
-        mirror = dssdev->get_mirror(dssdev);
+        mirror = dssdev->driver->get_mirror(dssdev);
         return snprintf(buf, PAGE_SIZE, "%u\n", mirror);
 }
 
@@ -228,12 +228,12 @@ static ssize_t display_mirror_store(struct device *dev,
         unsigned long mirror;
         int r;
 
-        if (!dssdev->set_mirror || !dssdev->get_mirror)
+        if (!dssdev->driver->set_mirror || !dssdev->driver->get_mirror)
                 return -ENOENT;
 
         mirror = simple_strtoul(buf, NULL, 0);
 
-        r = dssdev->set_mirror(dssdev, mirror);
+        r = dssdev->driver->set_mirror(dssdev, mirror);
         if (r)
                 return r;
 
diff --git a/drivers/video/omap2/dss/dsi.c b/drivers/video/omap2/dss/dsi.c
index 638d8c29e9d9..2f356d471b0e 100644
--- a/drivers/video/omap2/dss/dsi.c
+++ b/drivers/video/omap2/dss/dsi.c
@@ -3562,28 +3562,6 @@ static u8 dsi_display_get_rotate(struct omap_dss_device *dssdev)
         return dssdev->driver->get_rotate(dssdev);
 }
 
-static int dsi_display_set_mirror(struct omap_dss_device *dssdev, bool mirror)
-{
-        DSSDBGF("%d", mirror);
-
-        if (!dssdev->driver->set_mirror || !dssdev->driver->get_mirror)
-                return -EINVAL;
-
-        dsi_bus_lock();
-        dssdev->driver->set_mirror(dssdev, mirror);
-        dsi_bus_unlock();
-
-        return 0;
-}
-
-static bool dsi_display_get_mirror(struct omap_dss_device *dssdev)
-{
-        if (!dssdev->driver->set_mirror || !dssdev->driver->get_mirror)
-                return 0;
-
-        return dssdev->driver->get_mirror(dssdev);
-}
-
 void dsi_get_overlay_fifo_thresholds(enum omap_plane plane,
                 u32 fifo_size, enum omap_burst_size *burst_size,
                 u32 *fifo_low, u32 *fifo_high)
@@ -3615,9 +3593,6 @@ int dsi_init_display(struct omap_dss_device *dssdev)
         dssdev->get_rotate = dsi_display_get_rotate;
         dssdev->set_rotate = dsi_display_set_rotate;
 
-        dssdev->get_mirror = dsi_display_get_mirror;
-        dssdev->set_mirror = dsi_display_set_mirror;
-
         /* XXX these should be figured out dynamically */
         dssdev->caps = OMAP_DSS_DISPLAY_CAP_MANUAL_UPDATE |
                 OMAP_DSS_DISPLAY_CAP_TEAR_ELIM;