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: 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>

diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c
index bddd4c1c43ae39ce8580d0823dcb0edd36d99115..3b8f0fdf24a8af9cca5e8b14533a4fea3da88241 100644 (file)
--- a/drivers/gpu/drm/omapdrm/omap_drv.c
+++ b/drivers/gpu/drm/omapdrm/omap_drv.c
@@ -296,7 +296,7 @@ static int omap_modeset_init(struct drm_device *dev)
                struct drm_encoder *encoder;
                struct drm_crtc *crtc;
 
-               encoder = omap_encoder_init(dev, pipe->output, display);
+               encoder = omap_encoder_init(dev, pipe->output);
                if (!encoder)
                        return -ENOMEM;
 

diff --git a/drivers/gpu/drm/omapdrm/omap_encoder.c b/drivers/gpu/drm/omapdrm/omap_encoder.c
index acdfd217642386ef555ec686c0acd43ce903628c..1f4172f653b9e9b99b067f9df9bfee41c0c9e178 100644 (file)
--- a/drivers/gpu/drm/omapdrm/omap_encoder.c
+++ b/drivers/gpu/drm/omapdrm/omap_encoder.c
@@ -37,7 +37,6 @@
 struct omap_encoder {
        struct drm_encoder base;
        struct omap_dss_device *output;
-       struct omap_dss_device *display;
 };
 
 static void omap_encoder_destroy(struct drm_encoder *encoder)
@@ -247,8 +246,7 @@ static const struct drm_encoder_helper_funcs omap_encoder_helper_funcs = {
 
 /* initialize encoder */
 struct drm_encoder *omap_encoder_init(struct drm_device *dev,
-                                     struct omap_dss_device *output,
-                                     struct omap_dss_device *display)
+                                     struct omap_dss_device *output)
 {
        struct drm_encoder *encoder = NULL;
        struct omap_encoder *omap_encoder;
@@ -258,7 +256,6 @@ struct drm_encoder *omap_encoder_init(struct drm_device *dev,
                goto fail;
 
        omap_encoder->output = output;
-       omap_encoder->display = display;
 
        encoder = &omap_encoder->base;
 

diff --git a/drivers/gpu/drm/omapdrm/omap_encoder.h b/drivers/gpu/drm/omapdrm/omap_encoder.h
index a7b5dde63ecbf83ae5d4ae40a22b7880de88567f..4aefb3142886cd9b46c4f9ed264613cd309b676a 100644 (file)
--- a/drivers/gpu/drm/omapdrm/omap_encoder.h
+++ b/drivers/gpu/drm/omapdrm/omap_encoder.h
@@ -25,7 +25,6 @@ struct drm_encoder;
 struct omap_dss_device;
 
 struct drm_encoder *omap_encoder_init(struct drm_device *dev,
-                                     struct omap_dss_device *output,
-                                     struct omap_dss_device *display);
+                                     struct omap_dss_device *output);
 
 #endif /* __OMAPDRM_ENCODER_H__ */