mfd: cs42l43: Add some missing dev_err_probe()s

Use of dev_err_probe() was missed in the i2c and sdw parts of the code,
update the missing parts.

Suggested-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Link: https://lore.kernel.org/r/20240129152557.3221212-5-ckeepax@opensource.cirrus.com
Signed-off-by: Lee Jones <lee@kernel.org>

diff --git a/drivers/mfd/cs42l43-i2c.c b/drivers/mfd/cs42l43-i2c.c
index 7162274a0b55109bbefe481db83e9daba80946b9..c9e4ea76149a8880dde2212b0790958e3ecb89a1 100644 (file)
--- a/drivers/mfd/cs42l43-i2c.c
+++ b/drivers/mfd/cs42l43-i2c.c
@@ -38,7 +38,6 @@ static const struct regmap_config cs42l43_i2c_regmap = {
 static int cs42l43_i2c_probe(struct i2c_client *i2c)
 {
        struct cs42l43 *cs42l43;
-       int ret;
 
        cs42l43 = devm_kzalloc(&i2c->dev, sizeof(*cs42l43), GFP_KERNEL);
        if (!cs42l43)
@@ -50,11 +49,9 @@ static int cs42l43_i2c_probe(struct i2c_client *i2c)
        cs42l43->attached = true;
 
        cs42l43->regmap = devm_regmap_init_i2c(i2c, &cs42l43_i2c_regmap);
-       if (IS_ERR(cs42l43->regmap)) {
-               ret = PTR_ERR(cs42l43->regmap);
-               dev_err(cs42l43->dev, "Failed to allocate regmap: %d\n", ret);
-               return ret;
-       }
+       if (IS_ERR(cs42l43->regmap))
+               return dev_err_probe(cs42l43->dev, PTR_ERR(cs42l43->regmap),
+                                    "Failed to allocate regmap\n");
 
        return cs42l43_dev_probe(cs42l43);
 }

diff --git a/drivers/mfd/cs42l43-sdw.c b/drivers/mfd/cs42l43-sdw.c
index d6962a5a35f65ea05eb97424990fe6ede95b24bb..65f7b1d7824861041899c0f6bddda4776edc8cf0 100644 (file)
--- a/drivers/mfd/cs42l43-sdw.c
+++ b/drivers/mfd/cs42l43-sdw.c
@@ -171,7 +171,6 @@ static int cs42l43_sdw_probe(struct sdw_slave *sdw, const struct sdw_device_id *
 {
        struct cs42l43 *cs42l43;
        struct device *dev = &sdw->dev;
-       int ret;
 
        cs42l43 = devm_kzalloc(dev, sizeof(*cs42l43), GFP_KERNEL);
        if (!cs42l43)
@@ -181,11 +180,9 @@ static int cs42l43_sdw_probe(struct sdw_slave *sdw, const struct sdw_device_id *
        cs42l43->sdw = sdw;
 
        cs42l43->regmap = devm_regmap_init_sdw(sdw, &cs42l43_sdw_regmap);
-       if (IS_ERR(cs42l43->regmap)) {
-               ret = PTR_ERR(cs42l43->regmap);
-               dev_err(cs42l43->dev, "Failed to allocate regmap: %d\n", ret);
-               return ret;
-       }
+       if (IS_ERR(cs42l43->regmap))
+               return dev_err_probe(cs42l43->dev, PTR_ERR(cs42l43->regmap),
+                                    "Failed to allocate regmap\n");
 
        return cs42l43_dev_probe(cs42l43);
 }