aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2018-03-01 18:40:48 -0500
committerTomi Valkeinen <tomi.valkeinen@ti.com>2018-09-03 09:13:26 -0400
commit92ce521a4841131acf9af41e5bc772990ada06dc (patch)
tree663a8ad21c5b3d5ed2d4ae3a16d813fd4afba6a1 /drivers
parentde57e9dbc1454704a54190cb3b544b841c34301a (diff)
drm/omap: dss: Rename for_each_dss_dev macro to for_each_dss_display
The macro iterates over displays only, rename it accordingly. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/omapdrm/dss/dss.c2
-rw-r--r--drivers/gpu/drm/omapdrm/dss/omapdss.h2
-rw-r--r--drivers/gpu/drm/omapdrm/omap_drv.c4
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/omapdrm/dss/dss.c b/drivers/gpu/drm/omapdrm/dss/dss.c
index e93bed8edd7e..7245dd3423e6 100644
--- a/drivers/gpu/drm/omapdrm/dss/dss.c
+++ b/drivers/gpu/drm/omapdrm/dss/dss.c
@@ -1557,7 +1557,7 @@ static void dss_shutdown(struct platform_device *pdev)
1557 1557
1558 DSSDBG("shutdown\n"); 1558 DSSDBG("shutdown\n");
1559 1559
1560 for_each_dss_dev(dssdev) { 1560 for_each_dss_display(dssdev) {
1561 if (!dssdev->driver) 1561 if (!dssdev->driver)
1562 continue; 1562 continue;
1563 1563
diff --git a/drivers/gpu/drm/omapdrm/dss/omapdss.h b/drivers/gpu/drm/omapdrm/dss/omapdss.h
index 26abc09f3d4a..a6ddc881ea72 100644
--- a/drivers/gpu/drm/omapdrm/dss/omapdss.h
+++ b/drivers/gpu/drm/omapdrm/dss/omapdss.h
@@ -501,7 +501,7 @@ void omapdss_device_disconnect(struct omap_dss_device *src,
501 501
502struct omap_dss_device *omap_dss_get_device(struct omap_dss_device *dssdev); 502struct omap_dss_device *omap_dss_get_device(struct omap_dss_device *dssdev);
503void omap_dss_put_device(struct omap_dss_device *dssdev); 503void omap_dss_put_device(struct omap_dss_device *dssdev);
504#define for_each_dss_dev(d) while ((d = omap_dss_get_next_device(d)) != NULL) 504#define for_each_dss_display(d) while ((d = omap_dss_get_next_device(d)) != NULL)
505struct omap_dss_device *omap_dss_get_next_device(struct omap_dss_device *from); 505struct omap_dss_device *omap_dss_get_next_device(struct omap_dss_device *from);
506 506
507int omap_dss_get_num_overlay_managers(void); 507int omap_dss_get_num_overlay_managers(void);
diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c
index 6bc4b01c8e9c..4f402eb8088d 100644
--- a/drivers/gpu/drm/omapdrm/omap_drv.c
+++ b/drivers/gpu/drm/omapdrm/omap_drv.c
@@ -188,7 +188,7 @@ static int omap_connect_dssdevs(struct drm_device *ddev)
188 if (!omapdss_stack_is_ready()) 188 if (!omapdss_stack_is_ready())
189 return -EPROBE_DEFER; 189 return -EPROBE_DEFER;
190 190
191 for_each_dss_dev(dssdev) { 191 for_each_dss_display(dssdev) {
192 r = omapdss_device_connect(dssdev, NULL); 192 r = omapdss_device_connect(dssdev, NULL);
193 if (r == -EPROBE_DEFER) { 193 if (r == -EPROBE_DEFER) {
194 omap_dss_put_device(dssdev); 194 omap_dss_put_device(dssdev);
@@ -200,7 +200,7 @@ static int omap_connect_dssdevs(struct drm_device *ddev)
200 omap_dss_get_device(dssdev); 200 omap_dss_get_device(dssdev);
201 priv->dssdevs[priv->num_dssdevs++] = dssdev; 201 priv->dssdevs[priv->num_dssdevs++] = dssdev;
202 if (priv->num_dssdevs == ARRAY_SIZE(priv->dssdevs)) { 202 if (priv->num_dssdevs == ARRAY_SIZE(priv->dssdevs)) {
203 /* To balance the 'for_each_dss_dev' loop */ 203 /* To balance the 'for_each_dss_display' loop */
204 omap_dss_put_device(dssdev); 204 omap_dss_put_device(dssdev);
205 break; 205 break;
206 } 206 }