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>
This commit is contained in:
parent
27a7e3e184
commit
df6682b435
|
@ -176,7 +176,7 @@ EXPORT_SYMBOL(omapdss_device_next_output);
|
||||||
|
|
||||||
static bool omapdss_device_is_connected(struct omap_dss_device *dssdev)
|
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,
|
int omapdss_device_connect(struct dss_device *dss,
|
||||||
|
@ -198,11 +198,6 @@ int omapdss_device_connect(struct dss_device *dss,
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (src) {
|
|
||||||
WARN_ON(dst->src);
|
|
||||||
dst->src = src;
|
|
||||||
}
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL_GPL(omapdss_device_connect);
|
EXPORT_SYMBOL_GPL(omapdss_device_connect);
|
||||||
|
@ -217,13 +212,6 @@ void omapdss_device_disconnect(struct omap_dss_device *src,
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (src) {
|
|
||||||
if (WARN_ON(dst->src != src))
|
|
||||||
return;
|
|
||||||
|
|
||||||
dst->src = NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
WARN_ON(dst->state != OMAP_DSS_DISPLAY_DISABLED);
|
WARN_ON(dst->state != OMAP_DSS_DISPLAY_DISABLED);
|
||||||
|
|
||||||
dst->ops->disconnect(src, dst);
|
dst->ops->disconnect(src, dst);
|
||||||
|
|
|
@ -409,7 +409,6 @@ struct omap_dss_device {
|
||||||
struct module *owner;
|
struct module *owner;
|
||||||
|
|
||||||
struct dss_device *dss;
|
struct dss_device *dss;
|
||||||
struct omap_dss_device *src;
|
|
||||||
struct omap_dss_device *next;
|
struct omap_dss_device *next;
|
||||||
|
|
||||||
struct list_head list;
|
struct list_head list;
|
||||||
|
|
Loading…
Reference in New Issue