mfd: sec: Use dev_err_probe() where appropriate

dev_err_probe() exists to simplify code and harmonise error messages,
there's no reason not to use it here.

While at it, harmonise some error messages.

Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: André Draszik <andre.draszik@linaro.org>
Link: https://lore.kernel.org/r/20250409-s2mpg10-v4-13-d66d5f39b6bf@linaro.org
Signed-off-by: Lee Jones <lee@kernel.org>

diff --git a/drivers/mfd/sec-common.c b/drivers/mfd/sec-common.c
index 1a6f14dda825adeaeee1a677459c7399c144d553..f4c606c5ee5a809a106b13e947464f35a926b199 100644 (file)
--- a/drivers/mfd/sec-common.c
+++ b/drivers/mfd/sec-common.c
@@ -229,9 +229,9 @@ int sec_pmic_probe(struct device *dev, unsigned long device_type,
                num_sec_devs = ARRAY_SIZE(s2mpu05_devs);
                break;
        default:
-               dev_err(sec_pmic->dev, "Unsupported device type %lu\n",
-                       sec_pmic->device_type);
-               return -EINVAL;
+               return dev_err_probe(sec_pmic->dev, -EINVAL,
+                                    "Unsupported device type %lu\n",
+                                    sec_pmic->device_type);
        }
        ret = devm_mfd_add_devices(sec_pmic->dev, -1, sec_devs, num_sec_devs,
                                   NULL, 0, NULL);

diff --git a/drivers/mfd/sec-i2c.c b/drivers/mfd/sec-i2c.c
index 966d116dd781ac6ab63453f641b2a68bba3945a9..a107a9c1e760f90fcb59a9944b74e9a39a0d946c 100644 (file)
--- a/drivers/mfd/sec-i2c.c
+++ b/drivers/mfd/sec-i2c.c
@@ -134,7 +134,6 @@ static int sec_pmic_i2c_probe(struct i2c_client *client)
        const struct regmap_config *regmap;
        unsigned long device_type;
        struct regmap *regmap_pmic;
-       int ret;
 
        device_type = (unsigned long)of_device_get_match_data(&client->dev);
 
@@ -166,12 +165,9 @@ static int sec_pmic_i2c_probe(struct i2c_client *client)
        }
 
        regmap_pmic = devm_regmap_init_i2c(client, regmap);
-       if (IS_ERR(regmap_pmic)) {
-               ret = PTR_ERR(regmap_pmic);
-               dev_err(&client->dev, "Failed to allocate register map: %d\n",
-                       ret);
-               return ret;
-       }
+       if (IS_ERR(regmap_pmic))
+               return dev_err_probe(&client->dev, PTR_ERR(regmap_pmic),
+                                    "regmap init failed\n");
 
        return sec_pmic_probe(&client->dev, device_type, client->irq,
                              regmap_pmic, client);

diff --git a/drivers/mfd/sec-irq.c b/drivers/mfd/sec-irq.c
index b75d7fe86253037b4b7256a4d8c089003d58bc44..340f5f14eba3fad3b25935803dd33e91f7ec6629 100644 (file)
--- a/drivers/mfd/sec-irq.c
+++ b/drivers/mfd/sec-irq.c
@@ -487,18 +487,18 @@ int sec_irq_init(struct sec_pmic_dev *sec_pmic)
                sec_irq_chip = &s2mpu05_irq_chip;
                break;
        default:
-               dev_err(sec_pmic->dev, "Unknown device type %lu\n",
-                       sec_pmic->device_type);
-               return -EINVAL;
+               return dev_err_probe(sec_pmic->dev, -EINVAL,
+                                    "Unsupported device type %lu\n",
+                                    sec_pmic->device_type);
        }
 
        ret = devm_regmap_add_irq_chip(sec_pmic->dev, sec_pmic->regmap_pmic,
                                       sec_pmic->irq, IRQF_ONESHOT,
                                       0, sec_irq_chip, &sec_pmic->irq_data);
-       if (ret != 0) {
-               dev_err(sec_pmic->dev, "Failed to register IRQ chip: %d\n", ret);
-               return ret;
-       }
+       if (ret != 0)
+               return dev_err_probe(sec_pmic->dev, ret,
+                                    "Failed to add %s IRQ chip\n",
+                                    sec_irq_chip->name);
 
        /*
         * The rtc-s5m driver requests S2MPS14_IRQ_RTCA0 also for S2MPS11