The macro iterates over displays only, rename it accordingly.
Signed-off-by: Laurent Pinchart laurent.pinchart@ideasonboard.com --- drivers/gpu/drm/omapdrm/dss/dss.c | 2 +- drivers/gpu/drm/omapdrm/dss/omapdss.h | 2 +- drivers/gpu/drm/omapdrm/omap_drv.c | 4 ++-- 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 acafc6077a80..79bc43135808 100644 --- a/drivers/gpu/drm/omapdrm/dss/dss.c +++ b/drivers/gpu/drm/omapdrm/dss/dss.c @@ -1552,7 +1552,7 @@ static void dss_shutdown(struct platform_device *pdev)
DSSDBG("shutdown\n");
- for_each_dss_dev(dssdev) { + for_each_dss_display(dssdev) { if (!dssdev->driver) continue;
diff --git a/drivers/gpu/drm/omapdrm/dss/omapdss.h b/drivers/gpu/drm/omapdrm/dss/omapdss.h index 8d2258aec952..a2d146ed3924 100644 --- a/drivers/gpu/drm/omapdrm/dss/omapdss.h +++ b/drivers/gpu/drm/omapdrm/dss/omapdss.h @@ -499,7 +499,7 @@ void omapdss_device_disconnect(struct omap_dss_device *src,
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); diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c index 3e7d3fc79f49..ccab3865683c 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) 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); @@ -200,7 +200,7 @@ static int omap_connect_dssdevs(struct drm_device *ddev) 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; }