drm/vc4: hdmi: Remove DDC argument to connector_init

Now that we are passing the vc4_hdmi structure to the connector init
function, we can simply use the pointer in that structure instead of
having the pointer as an argument.

Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Tested-by: Chanwoo Choi <cw00.choi@samsung.com>
Tested-by: Hoegeun Kwon <hoegeun.kwon@samsung.com>
Tested-by: Stefan Wahren <stefan.wahren@i2se.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Link: https://patchwork.freedesktop.org/patch/msgid/4fe1b45fe45e4ba57d40154da010807d4e5db86c.1599120059.git-series.maxime@cerno.tech

diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
index 9a0612a87fb86438ec028f907816d58974d0d851..1f350b068fcd47262c8936c968984e4665066f06 100644 (file)
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
@@ -192,8 +192,7 @@ static const struct drm_connector_helper_funcs vc4_hdmi_connector_helper_funcs =
 };
 
 static int vc4_hdmi_connector_init(struct drm_device *dev,
-                                  struct vc4_hdmi *vc4_hdmi,
-                                  struct i2c_adapter *ddc)
+                                  struct vc4_hdmi *vc4_hdmi)
 {
        struct vc4_hdmi_connector *hdmi_connector = &vc4_hdmi->connector;
        struct drm_connector *connector = &hdmi_connector->base;
@@ -205,7 +204,7 @@ static int vc4_hdmi_connector_init(struct drm_device *dev,
        drm_connector_init_with_ddc(dev, connector,
                                    &vc4_hdmi_connector_funcs,
                                    DRM_MODE_CONNECTOR_HDMIA,
-                                   ddc);
+                                   vc4_hdmi->ddc);
        drm_connector_helper_add(connector, &vc4_hdmi_connector_helper_funcs);
 
        /* Create and attach TV margin props to this connector. */
@@ -1322,7 +1321,7 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data)
        drm_simple_encoder_init(drm, encoder, DRM_MODE_ENCODER_TMDS);
        drm_encoder_helper_add(encoder, &vc4_hdmi_encoder_helper_funcs);
 
-       ret = vc4_hdmi_connector_init(drm, hdmi, hdmi->ddc);
+       ret = vc4_hdmi_connector_init(drm, hdmi);
        if (ret)
                goto err_destroy_encoder;