| Message ID | 20181205150022.24200-22-laurent.pinchart@ideasonboard.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | omapdrm: Last large refactoring for drm_bridge transition | expand |
Hi, On Wed, Dec 05, 2018 at 05:00:14PM +0200, Laurent Pinchart wrote: > 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> -- Sebastian > drivers/gpu/drm/omapdrm/dss/base.c | 14 +------------- > drivers/gpu/drm/omapdrm/dss/omapdss.h | 1 - > 2 files changed, 1 insertion(+), 14 deletions(-) > > diff --git a/drivers/gpu/drm/omapdrm/dss/base.c b/drivers/gpu/drm/omapdrm/dss/base.c > index 8454e505b282..36f2d41c9935 100644 > --- a/drivers/gpu/drm/omapdrm/dss/base.c > +++ b/drivers/gpu/drm/omapdrm/dss/base.c > @@ -187,7 +187,7 @@ EXPORT_SYMBOL(omapdss_device_get_next); > > 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, > @@ -209,11 +209,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); > @@ -228,13 +223,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 7c9f8a5ceb37..80db32bc896f 100644 > --- a/drivers/gpu/drm/omapdrm/dss/omapdss.h > +++ b/drivers/gpu/drm/omapdrm/dss/omapdss.h > @@ -414,7 +414,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; > -- > Regards, > > Laurent Pinchart > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel
diff --git a/drivers/gpu/drm/omapdrm/dss/base.c b/drivers/gpu/drm/omapdrm/dss/base.c index 8454e505b282..36f2d41c9935 100644 --- a/drivers/gpu/drm/omapdrm/dss/base.c +++ b/drivers/gpu/drm/omapdrm/dss/base.c @@ -187,7 +187,7 @@ EXPORT_SYMBOL(omapdss_device_get_next); 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, @@ -209,11 +209,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); @@ -228,13 +223,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 7c9f8a5ceb37..80db32bc896f 100644 --- a/drivers/gpu/drm/omapdrm/dss/omapdss.h +++ b/drivers/gpu/drm/omapdrm/dss/omapdss.h @@ -414,7 +414,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;
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> --- drivers/gpu/drm/omapdrm/dss/base.c | 14 +------------- drivers/gpu/drm/omapdrm/dss/omapdss.h | 1 - 2 files changed, 1 insertion(+), 14 deletions(-)