diff options
| author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2018-09-13 03:48:02 +0300 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2019-03-18 11:42:12 +0200 |
| commit | df6682b43533e4c59c3d14b56de838c035a8bb9a (patch) | |
| tree | a2cc141dceeacbfaf716bb6c970b3fad8b485073 | |
| parent | 27a7e3e18419869cdcc414a404f3fe66f1b4e644 (diff) | |
| download | linux-df6682b43533e4c59c3d14b56de838c035a8bb9a.tar.bz2 | |
drm/omap: Remove src field from omap_dss_device structure
The field is only used to check whether the device is connected, and we
can do so by checking the dss field instead. Remove the src field.
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>
| -rw-r--r-- | drivers/gpu/drm/omapdrm/dss/base.c | 14 | ||||
| -rw-r--r-- | drivers/gpu/drm/omapdrm/dss/omapdss.h | 1 |
2 files changed, 1 insertions, 14 deletions
diff --git a/drivers/gpu/drm/omapdrm/dss/base.c b/drivers/gpu/drm/omapdrm/dss/base.c index 76470ba45660..62ccbeb99a84 100644 --- a/drivers/gpu/drm/omapdrm/dss/base.c +++ b/drivers/gpu/drm/omapdrm/dss/base.c @@ -176,7 +176,7 @@ EXPORT_SYMBOL(omapdss_device_next_output); static bool omapdss_device_is_connected(struct omap_dss_device *dssdev) { - return dssdev->src; + return dssdev->dss; } int omapdss_device_connect(struct dss_device *dss, @@ -198,11 +198,6 @@ int omapdss_device_connect(struct dss_device *dss, return ret; } - if (src) { - WARN_ON(dst->src); - dst->src = src; - } - return 0; } EXPORT_SYMBOL_GPL(omapdss_device_connect); @@ -217,13 +212,6 @@ void omapdss_device_disconnect(struct omap_dss_device *src, return; } - if (src) { - if (WARN_ON(dst->src != src)) - return; - - dst->src = NULL; - } - WARN_ON(dst->state != OMAP_DSS_DISPLAY_DISABLED); dst->ops->disconnect(src, dst); diff --git a/drivers/gpu/drm/omapdrm/dss/omapdss.h b/drivers/gpu/drm/omapdrm/dss/omapdss.h index dd93c2121a35..015b2dd9fb99 100644 --- a/drivers/gpu/drm/omapdrm/dss/omapdss.h +++ b/drivers/gpu/drm/omapdrm/dss/omapdss.h @@ -409,7 +409,6 @@ struct omap_dss_device { struct module *owner; struct dss_device *dss; - struct omap_dss_device *src; struct omap_dss_device *next; struct list_head list; |