struct omap_dss_device *omap_dss_get_device(struct omap_dss_device *dssdev);
 void omap_dss_put_device(struct omap_dss_device *dssdev);
-#define for_each_dss_dev(d) while ((d = omap_dss_get_next_device(d)) != NULL)
+#define for_each_dss_display(d) while ((d = omap_dss_get_next_device(d)) != NULL)
 struct omap_dss_device *omap_dss_get_next_device(struct omap_dss_device *from);
 
 int omap_dss_get_num_overlay_managers(void);
 
        if (!omapdss_stack_is_ready())
                return -EPROBE_DEFER;
 
-       for_each_dss_dev(dssdev) {
+       for_each_dss_display(dssdev) {
                r = omapdss_device_connect(dssdev, NULL);
                if (r == -EPROBE_DEFER) {
                        omap_dss_put_device(dssdev);
                        omap_dss_get_device(dssdev);
                        priv->dssdevs[priv->num_dssdevs++] = dssdev;
                        if (priv->num_dssdevs == ARRAY_SIZE(priv->dssdevs)) {
-                               /* To balance the 'for_each_dss_dev' loop */
+                               /* To balance the 'for_each_dss_display' loop */
                                omap_dss_put_device(dssdev);
                                break;
                        }