RepoMirrors
/
openwrt
mirror of git://git.openwrt.org/openwrt/openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

lantiq: use more devm for i2c 

i2c_add_numbered_adapter is the wrong function to use here. It requires
setting nr to some value, otherwise it behaves the same as
i2c_add_adapter. nr is not set.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/16825
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
This commit is contained in:
Rosen Penev 2024-10-18 19:08:02 -07:00 committed by Hauke Mehrtens
parent adb921c34f
commit 44824f0b78
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
target/linux/lantiq/patches-6.6/0031-I2C-MIPS-lantiq-add-FALC-ON-i2c-bus-master.patch
View File

@ -47,7 +47,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
obj-$(CONFIG_I2C_MESON) += i2c-meson.o obj-$(CONFIG_I2C_MESON) += i2c-meson.o
--- /dev/null --- /dev/null
+++ b/drivers/i2c/busses/i2c-lantiq.c +++ b/drivers/i2c/busses/i2c-lantiq.c
@@ -0,0 +1,745 @@ @@ -0,0 +1,742 @@
+ +
+/* +/*
+ * Lantiq I2C bus adapter + * Lantiq I2C bus adapter
@ -658,7 +658,9 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
+ } + }
+ +
+ init_completion(&priv->cmd_complete); + init_completion(&priv->cmd_complete);
+ mutex_init(&priv->mutex); + ret = devm_mutex_init(&pdev->dev, &priv->mutex);
+ if (ret)
+ return ret;
+ +
+ priv->membase = devm_platform_ioremap_resource(pdev, 0); + priv->membase = devm_platform_ioremap_resource(pdev, 0);
+ if (IS_ERR(priv->membase)) + if (IS_ERR(priv->membase))
@ -719,7 +721,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
+ clk_activate(priv->clk_gate); + clk_activate(priv->clk_gate);
+ +
+ /* add our adapter to the i2c stack */ + /* add our adapter to the i2c stack */
+ ret = i2c_add_numbered_adapter(adap); + ret = devm_i2c_add_adapter(&pdev->dev, adap);
+ if (ret) { + if (ret) {
+ dev_err(&pdev->dev, "can't register I2C adapter\n"); + dev_err(&pdev->dev, "can't register I2C adapter\n");
+ goto out; + goto out;
@ -737,7 +739,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
+ ret = ltq_i2c_hw_init(adap); + ret = ltq_i2c_hw_init(adap);
+ if (ret) { + if (ret) {
+ dev_err(&pdev->dev, "can't configure adapter\n"); + dev_err(&pdev->dev, "can't configure adapter\n");
+ i2c_del_adapter(adap);
+ platform_set_drvdata(pdev, NULL); + platform_set_drvdata(pdev, NULL);
+ goto out; + goto out;
+ } else { + } else {
@ -762,10 +763,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
+ /* power down the core */ + /* power down the core */
+ clk_deactivate(priv->clk_gate); + clk_deactivate(priv->clk_gate);
+ +
+ /* remove driver */
+ i2c_del_adapter(&priv->adap);
+ kfree(priv);
+
+ dev_dbg(&pdev->dev, "removed\n"); + dev_dbg(&pdev->dev, "removed\n");
+ platform_set_drvdata(pdev, NULL); + platform_set_drvdata(pdev, NULL);
+ +