Skip to content

Commit 078bb17

Browse files
Andy Yanmmind
authored andcommitted
drm/rockchip: inno_hdmi: switch i2c registration to devm functions
Switch from i2c_add_adapter() to resource managed devm_i2c_add_adapter(), which will make the cleanup code more simpler. Signed-off-by: Andy Yan <andy.yan@rock-chips.com> Signed-off-by: Heiko Stuebner <heiko@sntech.de> Link: https://lore.kernel.org/r/20250512124615.2848731-8-andyshrk@163.com
1 parent 1749267 commit 078bb17

1 file changed

Lines changed: 2 additions & 6 deletions

File tree

drivers/gpu/drm/rockchip/inno_hdmi.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1230,10 +1230,9 @@ static struct i2c_adapter *inno_hdmi_i2c_adapter(struct inno_hdmi *hdmi)
12301230
strscpy(adap->name, "Inno HDMI", sizeof(adap->name));
12311231
i2c_set_adapdata(adap, hdmi);
12321232

1233-
ret = i2c_add_adapter(adap);
1233+
ret = devm_i2c_add_adapter(hdmi->dev, adap);
12341234
if (ret) {
12351235
dev_warn(hdmi->dev, "cannot add %s I2C adapter\n", adap->name);
1236-
devm_kfree(hdmi->dev, i2c);
12371236
return ERR_PTR(ret);
12381237
}
12391238

@@ -1316,7 +1315,7 @@ static int inno_hdmi_bind(struct device *dev, struct device *master,
13161315

13171316
ret = inno_hdmi_register(drm, hdmi);
13181317
if (ret)
1319-
goto err_put_adapter;
1318+
goto err_disable_clk;
13201319

13211320
dev_set_drvdata(dev, hdmi);
13221321

@@ -1330,8 +1329,6 @@ static int inno_hdmi_bind(struct device *dev, struct device *master,
13301329
err_cleanup_hdmi:
13311330
hdmi->connector.funcs->destroy(&hdmi->connector);
13321331
hdmi->encoder.encoder.funcs->destroy(&hdmi->encoder.encoder);
1333-
err_put_adapter:
1334-
i2c_put_adapter(hdmi->ddc);
13351332
err_disable_clk:
13361333
clk_disable_unprepare(hdmi->refclk);
13371334
err_disable_pclk:
@@ -1347,7 +1344,6 @@ static void inno_hdmi_unbind(struct device *dev, struct device *master,
13471344
hdmi->connector.funcs->destroy(&hdmi->connector);
13481345
hdmi->encoder.encoder.funcs->destroy(&hdmi->encoder.encoder);
13491346

1350-
i2c_put_adapter(hdmi->ddc);
13511347
clk_disable_unprepare(hdmi->refclk);
13521348
clk_disable_unprepare(hdmi->pclk);
13531349
}

0 commit comments

Comments
 (0)