diff options
| author | Markus Stockhausen | 2025-05-28 05:32:49 +0000 |
|---|---|---|
| committer | Robert Marko | 2025-06-11 20:27:22 +0000 |
| commit | abee1c20402ffdb0b0afc528fa43eb17bd914f9b (patch) | |
| tree | 92313dd2cdb2f417012e4cf69bcf7a2ccc069256 | |
| parent | d9a5cafc40926d7afe2d8da9202d9f8d51255997 (diff) | |
| download | openwrt-abee1c20402ffdb0b0afc528fa43eb17bd914f9b.tar.gz | |
realtek: 6.12: adapt RTL9300 i2c bus & mux drivers
Fix minor compilation errors due to kernel changes.
Signed-off-by: Jonas Jelonek <jelonek.jonas@gmail.com>
Signed-off-by: Markus Stockhausen <markus.stockhausen@gmx.de>
Link: https://github.com/openwrt/openwrt/pull/18935
Signed-off-by: Robert Marko <robimarko@gmail.com>
| -rw-r--r-- | target/linux/realtek/files-6.12/drivers/i2c/busses/i2c-rtl9300.c | 7 | ||||
| -rw-r--r-- | target/linux/realtek/files-6.12/drivers/i2c/muxes/i2c-mux-rtl9300.c | 6 |
2 files changed, 5 insertions, 8 deletions
diff --git a/target/linux/realtek/files-6.12/drivers/i2c/busses/i2c-rtl9300.c b/target/linux/realtek/files-6.12/drivers/i2c/busses/i2c-rtl9300.c index 9565c4756f..49d7dbf98b 100644 --- a/target/linux/realtek/files-6.12/drivers/i2c/busses/i2c-rtl9300.c +++ b/target/linux/realtek/files-6.12/drivers/i2c/busses/i2c-rtl9300.c @@ -2,6 +2,7 @@ #include <linux/module.h> #include <linux/of_platform.h> +#include <linux/platform_device.h> #include "i2c-rtl9300.h" #define REG(i, x) (i->base + x + (i->scl_num ? i->mst2_offset : 0)) @@ -411,7 +412,7 @@ static int rtl9300_i2c_probe(struct platform_device *pdev) adap->dev.parent = &pdev->dev; i2c_set_adapdata(adap, i2c); adap->dev.of_node = node; - strlcpy(adap->name, dev_name(&pdev->dev), sizeof(adap->name)); + strscpy(adap->name, dev_name(&pdev->dev), sizeof(adap->name)); platform_set_drvdata(pdev, i2c); @@ -422,13 +423,11 @@ static int rtl9300_i2c_probe(struct platform_device *pdev) return ret; } -static int rtl9300_i2c_remove(struct platform_device *pdev) +static void rtl9300_i2c_remove(struct platform_device *pdev) { struct rtl9300_i2c *i2c = platform_get_drvdata(pdev); i2c_del_adapter(&i2c->adap); - - return 0; } struct i2c_drv_data rtl9300_i2c_drv_data = { diff --git a/target/linux/realtek/files-6.12/drivers/i2c/muxes/i2c-mux-rtl9300.c b/target/linux/realtek/files-6.12/drivers/i2c/muxes/i2c-mux-rtl9300.c index 57036d9d56..a19a1a148e 100644 --- a/target/linux/realtek/files-6.12/drivers/i2c/muxes/i2c-mux-rtl9300.c +++ b/target/linux/realtek/files-6.12/drivers/i2c/muxes/i2c-mux-rtl9300.c @@ -251,7 +251,7 @@ static int rtl9300_i2c_mux_probe(struct platform_device *pdev) mux_data->sda_sel(muxc, channels[chan].sda_num); - ret = i2c_mux_add_adapter(muxc, 0, chan, 0); + ret = i2c_mux_add_adapter(muxc, 0, chan); if (ret) goto err_children; } @@ -268,14 +268,12 @@ err_parent: return ret; } -static int rtl9300_i2c_mux_remove(struct platform_device *pdev) +static void rtl9300_i2c_mux_remove(struct platform_device *pdev) { struct i2c_mux_core *muxc = platform_get_drvdata(pdev); i2c_mux_del_adapters(muxc); i2c_put_adapter(muxc->parent); - - return 0; } static struct platform_driver i2c_mux_driver = { |