Commit 79d11e96 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Tomi Valkeinen

drm/omap: Don't pass display pointer to encoder init function

The display isn't used by the encoder implementation, don't pass it to
the initialization function and store it internally needlessly.
Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: default avatarSebastian Reichel <sebastian.reichel@collabora.com>
Tested-by: default avatarSebastian Reichel <sebastian.reichel@collabora.com>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent 40e5f937
...@@ -296,7 +296,7 @@ static int omap_modeset_init(struct drm_device *dev) ...@@ -296,7 +296,7 @@ static int omap_modeset_init(struct drm_device *dev)
struct drm_encoder *encoder; struct drm_encoder *encoder;
struct drm_crtc *crtc; struct drm_crtc *crtc;
encoder = omap_encoder_init(dev, pipe->output, display); encoder = omap_encoder_init(dev, pipe->output);
if (!encoder) if (!encoder)
return -ENOMEM; return -ENOMEM;
......
...@@ -37,7 +37,6 @@ ...@@ -37,7 +37,6 @@
struct omap_encoder { struct omap_encoder {
struct drm_encoder base; struct drm_encoder base;
struct omap_dss_device *output; struct omap_dss_device *output;
struct omap_dss_device *display;
}; };
static void omap_encoder_destroy(struct drm_encoder *encoder) static void omap_encoder_destroy(struct drm_encoder *encoder)
...@@ -247,8 +246,7 @@ static const struct drm_encoder_helper_funcs omap_encoder_helper_funcs = { ...@@ -247,8 +246,7 @@ static const struct drm_encoder_helper_funcs omap_encoder_helper_funcs = {
/* initialize encoder */ /* initialize encoder */
struct drm_encoder *omap_encoder_init(struct drm_device *dev, struct drm_encoder *omap_encoder_init(struct drm_device *dev,
struct omap_dss_device *output, struct omap_dss_device *output)
struct omap_dss_device *display)
{ {
struct drm_encoder *encoder = NULL; struct drm_encoder *encoder = NULL;
struct omap_encoder *omap_encoder; struct omap_encoder *omap_encoder;
...@@ -258,7 +256,6 @@ struct drm_encoder *omap_encoder_init(struct drm_device *dev, ...@@ -258,7 +256,6 @@ struct drm_encoder *omap_encoder_init(struct drm_device *dev,
goto fail; goto fail;
omap_encoder->output = output; omap_encoder->output = output;
omap_encoder->display = display;
encoder = &omap_encoder->base; encoder = &omap_encoder->base;
......
...@@ -25,7 +25,6 @@ struct drm_encoder; ...@@ -25,7 +25,6 @@ struct drm_encoder;
struct omap_dss_device; struct omap_dss_device;
struct drm_encoder *omap_encoder_init(struct drm_device *dev, struct drm_encoder *omap_encoder_init(struct drm_device *dev,
struct omap_dss_device *output, struct omap_dss_device *output);
struct omap_dss_device *display);
#endif /* __OMAPDRM_ENCODER_H__ */ #endif /* __OMAPDRM_ENCODER_H__ */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment