Merge remote-tracking branches 'regulator/fix/email' and 'regulator/fix/qcom-smd...

[deliverable/linux.git] / drivers / gpu / drm / rcar-du / rcar_du_vgacon.c

diff --git a/drivers/gpu/drm/rcar-du/rcar_du_vgacon.c b/drivers/gpu/drm/rcar-du/rcar_du_vgacon.c
index 9d7e5c99caf691ddf0e97167aaf7165ef9f4f9e0..8d6125c1c0f9352fd9f5449b8877f4c3e89be05b 100644 (file)
--- a/drivers/gpu/drm/rcar-du/rcar_du_vgacon.c
+++ b/drivers/gpu/drm/rcar-du/rcar_du_vgacon.c
@@ -28,7 +28,6 @@ static int rcar_du_vga_connector_get_modes(struct drm_connector *connector)
 
 static const struct drm_connector_helper_funcs connector_helper_funcs = {
        .get_modes = rcar_du_vga_connector_get_modes,
-       .best_encoder = rcar_du_connector_best_encoder,
 };
 
 static enum drm_connector_status
@@ -79,7 +78,5 @@ int rcar_du_vga_connector_init(struct rcar_du_device *rcdu,
        if (ret < 0)
                return ret;
 
-       rcon->encoder = renc;
-
        return 0;
 }