diff options
Diffstat (limited to 'drivers/gpu/drm/omapdrm')
| -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; |