hwmon: (tmp108) Add helper function tmp108_common_probe() to prepare I3C support

Add help function tmp108_common_probe() to pave road to support i3c for
P3T1085(NXP) chip.

Use dev_err_probe() to simplify the code.

Signed-off-by: Frank Li <Frank.Li@nxp.com>
Message-ID: <20241112-p3t1085-v4-1-a1334314b1e6@nxp.com>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>

diff --git a/drivers/hwmon/tmp108.c b/drivers/hwmon/tmp108.c
index b561b452d8d39adc9f1c72947784bf328730ffd1..bfbea6349a95f81fa79ed0d03735e3598b66efa1 100644 (file)
--- a/drivers/hwmon/tmp108.c
+++ b/drivers/hwmon/tmp108.c
@@ -323,33 +323,19 @@ static const struct regmap_config tmp108_regmap_config = {
        .use_single_write = true,
 };
 
-static int tmp108_probe(struct i2c_client *client)
+static int tmp108_common_probe(struct device *dev, struct regmap *regmap, char *name)
 {
-       struct device *dev = &client->dev;
        struct device *hwmon_dev;
        struct tmp108 *tmp108;
-       int err;
        u32 config;
-
-       if (!i2c_check_functionality(client->adapter,
-                                    I2C_FUNC_SMBUS_WORD_DATA)) {
-               dev_err(dev,
-                       "adapter doesn't support SMBus word transactions\n");
-               return -ENODEV;
-       }
+       int err;
 
        tmp108 = devm_kzalloc(dev, sizeof(*tmp108), GFP_KERNEL);
        if (!tmp108)
                return -ENOMEM;
 
        dev_set_drvdata(dev, tmp108);
-
-       tmp108->regmap = devm_regmap_init_i2c(client, &tmp108_regmap_config);
-       if (IS_ERR(tmp108->regmap)) {
-               err = PTR_ERR(tmp108->regmap);
-               dev_err(dev, "regmap init failed: %d", err);
-               return err;
-       }
+       tmp108->regmap = regmap;
 
        err = regmap_read(tmp108->regmap, TMP108_REG_CONF, &config);
        if (err < 0) {
@@ -383,13 +369,30 @@ static int tmp108_probe(struct i2c_client *client)
                return err;
        }
 
-       hwmon_dev = devm_hwmon_device_register_with_info(dev, client->name,
+       hwmon_dev = devm_hwmon_device_register_with_info(dev, name,
                                                         tmp108,
                                                         &tmp108_chip_info,
                                                         NULL);
        return PTR_ERR_OR_ZERO(hwmon_dev);
 }
 
+static int tmp108_probe(struct i2c_client *client)
+{
+       struct device *dev = &client->dev;
+       struct regmap *regmap;
+
+       if (!i2c_check_functionality(client->adapter,
+                                    I2C_FUNC_SMBUS_WORD_DATA))
+               return dev_err_probe(dev, -ENODEV,
+                                    "adapter doesn't support SMBus word transactions\n");
+
+       regmap = devm_regmap_init_i2c(client, &tmp108_regmap_config);
+       if (IS_ERR(regmap))
+               return dev_err_probe(dev, PTR_ERR(regmap), "regmap init failed");
+
+       return tmp108_common_probe(dev, regmap, client->name);
+}
+
 static int tmp108_suspend(struct device *dev)
 {
        struct tmp108 *tmp108 = dev_get_drvdata(dev);