[PATCH 41/41] drm: renesas: shmobile: remove now-redundant call to drm_connector_attach_encoder()

[Luca Ceresoli]

drm_connector_attach_encoder() is now called by
drm_bridge_connector_init().

Signed-off-by: Luca Ceresoli <luca.ceresoli@xxxxxxxxxxx>
---
 drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c b/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c
index 5f460b38596c..866afe805e6f 100644
--- a/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c
+++ b/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c
@@ -596,20 +596,21 @@ int shmob_drm_connector_create(struct shmob_drm_device *sdev,
 	struct drm_connector *connector;
 	int ret;
 
-	if (sdev->pdata)
+	if (sdev->pdata) {
 		connector = shmob_drm_connector_init(sdev, encoder);
-	else
+
+		ret = drm_connector_attach_encoder(connector, encoder);
+		if (ret < 0)
+			goto error;
+	} else {
 		connector = drm_bridge_connector_init(&sdev->ddev, encoder);
+	}
 	if (IS_ERR(connector)) {
 		dev_err(sdev->dev, "failed to created connector: %pe\n",
 			connector);
 		return PTR_ERR(connector);
 	}
 
-	ret = drm_connector_attach_encoder(connector, encoder);
-	if (ret < 0)
-		goto error;
-
 	connector->dpms = DRM_MODE_DPMS_OFF;
 
 	sdev->connector = connector;

-- 
2.53.0