summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/omapdrm
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2018-09-12 19:05:18 +0300
committerTomi Valkeinen <tomi.valkeinen@ti.com>2019-03-18 11:42:12 +0200
commit56c9818d5c89b2655c6b4c65b99829faf5b4f544 (patch)
tree7f7600e8757adec978d17e342cba520dac072123 /drivers/gpu/drm/omapdrm
parent19b4200d8f4b90b5a41592f9021b52153ac2b6b5 (diff)
drm/omap: Remove omap_dss_device dst field
The field is only used in a safety check during device connection/disconnection, where the src field can be easily used instead. Remove it and use src. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.com> Tested-by: Sebastian Reichel <sebastian.reichel@collabora.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/gpu/drm/omapdrm')
-rw-r--r--drivers/gpu/drm/omapdrm/dss/base.c6
-rw-r--r--drivers/gpu/drm/omapdrm/dss/omapdss.h1
2 files changed, 2 insertions, 5 deletions
diff --git a/drivers/gpu/drm/omapdrm/dss/base.c b/drivers/gpu/drm/omapdrm/dss/base.c
index 916225d62cc2..76470ba45660 100644
--- a/drivers/gpu/drm/omapdrm/dss/base.c
+++ b/drivers/gpu/drm/omapdrm/dss/base.c
@@ -199,9 +199,8 @@ int omapdss_device_connect(struct dss_device *dss,
}
if (src) {
- WARN_ON(src->dst);
+ WARN_ON(dst->src);
dst->src = src;
- src->dst = dst;
}
return 0;
@@ -219,11 +218,10 @@ void omapdss_device_disconnect(struct omap_dss_device *src,
}
if (src) {
- if (WARN_ON(dst != src->dst))
+ if (WARN_ON(dst->src != src))
return;
dst->src = NULL;
- src->dst = NULL;
}
WARN_ON(dst->state != OMAP_DSS_DISPLAY_DISABLED);
diff --git a/drivers/gpu/drm/omapdrm/dss/omapdss.h b/drivers/gpu/drm/omapdrm/dss/omapdss.h
index 4cd3874228a5..fc82b8f545ae 100644
--- a/drivers/gpu/drm/omapdrm/dss/omapdss.h
+++ b/drivers/gpu/drm/omapdrm/dss/omapdss.h
@@ -406,7 +406,6 @@ struct omap_dss_device {
struct dss_device *dss;
struct omap_dss_device *src;
- struct omap_dss_device *dst;
struct omap_dss_device *next;
struct list_head list;