OMAPDSS: use the panel list in omap_dss_get_next_device

omap_dss_get_next_device() uses the dss bus to iterate over the
displays. This patch changes omap_dss_get_next_device() to use the new
panel list instead.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>

1 files changed, 39 insertions, 15 deletions

diff --git a/drivers/video/omap2/dss/display.c b/drivers/video/omap2/dss/display.c
index 1c175a4e7f6b..ba83ec3bfc8c 100644
--- a/drivers/video/omap2/dss/display.c
+++ b/drivers/video/omap2/dss/display.c
@@ -191,27 +191,51 @@ void omap_dss_put_device(struct omap_dss_device *dssdev)
 }
 EXPORT_SYMBOL(omap_dss_put_device);
 
-/* ref count of the found device is incremented. ref count
- * of from-device is decremented. */
+/*
+ * ref count of the found device is incremented.
+ * ref count of from-device is decremented.
+ */
 struct omap_dss_device *omap_dss_get_next_device(struct omap_dss_device *from)
 {
-        struct device *dev;
-        struct device *dev_start = NULL;
-        struct omap_dss_device *dssdev = NULL;
+        struct list_head *l;
+        struct omap_dss_device *dssdev;
+
+        mutex_lock(&panel_list_mutex);
 
-        int match(struct device *dev, void *data)
-        {
-                return 1;
+        if (list_empty(&panel_list)) {
+                dssdev = NULL;
+                goto out;
         }
 
-        if (from)
-                dev_start = &from->dev;
-        dev = bus_find_device(dss_get_bus(), dev_start, NULL, match);
-        if (dev)
-                dssdev = to_dss_device(dev);
-        if (from)
-                put_device(&from->dev);
+        if (from == NULL) {
+                dssdev = list_first_entry(&panel_list, struct omap_dss_device,
+                                panel_list);
+                omap_dss_get_device(dssdev);
+                goto out;
+        }
+
+        omap_dss_put_device(from);
+
+        list_for_each(l, &panel_list) {
+                dssdev = list_entry(l, struct omap_dss_device, panel_list);
+                if (dssdev == from) {
+                        if (list_is_last(l, &panel_list)) {
+                                dssdev = NULL;
+                                goto out;
+                        }
+
+                        dssdev = list_entry(l->next, struct omap_dss_device,
+                                        panel_list);
+                        omap_dss_get_device(dssdev);
+                        goto out;
+                }
+        }
 
+        WARN(1, "'from' dssdev not found\n");
+
+        dssdev = NULL;
+out:
+        mutex_unlock(&panel_list_mutex);
         return dssdev;
 }
 EXPORT_SYMBOL(omap_dss_get_next_device);