[PATCH v2 1/2] drm/bridge: dw-hdmi: Don't cleanup i2c adapter and ddc ptr in __dw_hdmi_probe() bailout path

Liu Ying victor.liu at nxp.com
Tue Jun 30 02:33:39 UTC 2020


It's unnecessary to cleanup the i2c adapter and the ddc pointer in
the bailout path of  __dw_hdmi_probe(), since the adapter is not
added and the ddc pointer is not set.

Fixes: a23d6265f033 (drm: bridge: dw-hdmi: Extract PHY interrupt setup to a function)
Cc: Andrzej Hajda <a.hajda at samsung.com>
Cc: Neil Armstrong <narmstrong at baylibre.com>
Cc: Laurent Pinchart <Laurent.pinchart at ideasonboard.com>
Cc: Jonas Karlman <jonas at kwiboo.se>
Cc: Jernej Skrabec <jernej.skrabec at siol.net>
Cc: David Airlie <airlied at linux.ie>
Cc: Daniel Vetter <daniel at ffwll.ch>
Cc: Boris Brezillon <boris.brezillon at collabora.com>
Cc: Jerome Brunet <jbrunet at baylibre.com>
Cc: Cheng-Yi Chiang <cychiang at chromium.org>
Cc: Dariusz Marcinkiewicz <darekm at google.com>
Cc: Archit Taneja <architt at codeaurora.org>
Cc: Jose Abreu <joabreu at synopsys.com>
Cc: dri-devel at lists.freedesktop.org
Cc: NXP Linux Team <linux-imx at nxp.com>
Signed-off-by: Liu Ying <victor.liu at nxp.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart at ideasonboard.com>
---
v1->v2:
* Add Laurent's R-b tag.

 drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
index 6148a02..137b6eb 100644
--- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
+++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
@@ -3441,11 +3441,6 @@ __dw_hdmi_probe(struct platform_device *pdev,
 	return hdmi;
 
 err_iahb:
-	if (hdmi->i2c) {
-		i2c_del_adapter(&hdmi->i2c->adap);
-		hdmi->ddc = NULL;
-	}
-
 	clk_disable_unprepare(hdmi->iahb_clk);
 	if (hdmi->cec_clk)
 		clk_disable_unprepare(hdmi->cec_clk);
-- 
2.7.4



More information about the dri-devel mailing list