[PATCH v2 05/11] i2c: isch: switch i2c registration to devm functions

Andy Shevchenko
2024-09-16T12:02:53Z

Switch from i2c_add_adapter() to resource managed devm_i2c_add_adapter()
for matching rest of driver initialization, and more concise code.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
drivers/i2c/busses/i2c-isch.c | 17 +----------------
1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/drivers/i2c/busses/i2c-isch.c b/drivers/i2c/busses/i2c-isch.c
index 0fe7c9d1dd0d..d752f822b52e 100644
--- a/drivers/i2c/busses/i2c-isch.c
+++ b/drivers/i2c/busses/i2c-isch.c
@@ -274,7 +274,6 @@ static int smbus_sch_probe(struct platform_device *dev)
{
struct sch_i2c *priv;
struct resource *res;
- int retval;

priv = devm_kzalloc(&dev->dev, sizeof(*priv), GFP_KERNEL);
if (!priv)
@@ -299,20 +298,7 @@ static int smbus_sch_probe(struct platform_device *dev)
snprintf(priv->adapter.name, sizeof(priv->adapter.name),
"SMBus SCH adapter at %04x", (unsigned short)res->start);

- retval = i2c_add_adapter(&priv->adapter);
- if (retval)
- return retval;
-
- platform_set_drvdata(dev, priv);
-
- return 0;
-}
-
-static void smbus_sch_remove(struct platform_device *pdev)
-{
- struct sch_i2c *priv = platform_get_drvdata(pdev);
-
- i2c_del_adapter(&priv->adapter);
+ return devm_i2c_add_adapter(&dev->dev, &priv->adapter);
}

static struct platform_driver smbus_sch_driver = {
@@ -320,7 +306,6 @@ static struct platform_driver smbus_sch_driver = {
.name = "isch_smbus",
},
.probe = smbus_sch_probe,
- .remove_new = smbus_sch_remove,
};

module_platform_driver(smbus_sch_driver);
--
2.43.0.rc1.1336.g36b5255a03ac