ASoC: cs35l41: Make use of dev_err_probe()

Use dev_err_probe() helper where possible, to simplify error handling
during probe.

Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
Acked-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Reviewed-by: Takashi Iwai <tiwai@suse.de>
Link: https://lore.kernel.org/r/20230907171010.1447274-8-cristian.ciocaltea@collabora.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/cs35l41-i2c.c b/sound/soc/codecs/cs35l41-i2c.c
index 7ea890d7d3874d28234bdfb8fc8ff2fa1d8adb3a..9109203a7f25a3a033f51314c34aacd928fa6cef 100644 (file)
--- a/sound/soc/codecs/cs35l41-i2c.c
+++ b/sound/soc/codecs/cs35l41-i2c.c
@@ -35,7 +35,6 @@ static int cs35l41_i2c_probe(struct i2c_client *client)
        struct device *dev = &client->dev;
        struct cs35l41_hw_cfg *hw_cfg = dev_get_platdata(dev);
        const struct regmap_config *regmap_config = &cs35l41_regmap_i2c;
-       int ret;
 
        cs35l41 = devm_kzalloc(dev, sizeof(struct cs35l41_private), GFP_KERNEL);
 
@@ -47,11 +46,9 @@ static int cs35l41_i2c_probe(struct i2c_client *client)
 
        i2c_set_clientdata(client, cs35l41);
        cs35l41->regmap = devm_regmap_init_i2c(client, regmap_config);
-       if (IS_ERR(cs35l41->regmap)) {
-               ret = PTR_ERR(cs35l41->regmap);
-               dev_err(cs35l41->dev, "Failed to allocate register map: %d\n", ret);
-               return ret;
-       }
+       if (IS_ERR(cs35l41->regmap))
+               return dev_err_probe(cs35l41->dev, PTR_ERR(cs35l41->regmap),
+                                    "Failed to allocate register map\n");
 
        return cs35l41_probe(cs35l41, hw_cfg);
 }

diff --git a/sound/soc/codecs/cs35l41-spi.c b/sound/soc/codecs/cs35l41-spi.c
index 5c8bb24909eb40596142cd3fdfe9f22880288fff..28e9c9473e60cd23b297994b4ee915a53bf011c3 100644 (file)
--- a/sound/soc/codecs/cs35l41-spi.c
+++ b/sound/soc/codecs/cs35l41-spi.c
@@ -32,7 +32,6 @@ static int cs35l41_spi_probe(struct spi_device *spi)
        const struct regmap_config *regmap_config = &cs35l41_regmap_spi;
        struct cs35l41_hw_cfg *hw_cfg = dev_get_platdata(&spi->dev);
        struct cs35l41_private *cs35l41;
-       int ret;
 
        cs35l41 = devm_kzalloc(&spi->dev, sizeof(struct cs35l41_private), GFP_KERNEL);
        if (!cs35l41)
@@ -43,11 +42,9 @@ static int cs35l41_spi_probe(struct spi_device *spi)
 
        spi_set_drvdata(spi, cs35l41);
        cs35l41->regmap = devm_regmap_init_spi(spi, regmap_config);
-       if (IS_ERR(cs35l41->regmap)) {
-               ret = PTR_ERR(cs35l41->regmap);
-               dev_err(&spi->dev, "Failed to allocate register map: %d\n", ret);
-               return ret;
-       }
+       if (IS_ERR(cs35l41->regmap))
+               return dev_err_probe(cs35l41->dev, PTR_ERR(cs35l41->regmap),
+                                    "Failed to allocate register map\n");
 
        cs35l41->dev = &spi->dev;
        cs35l41->irq = spi->irq;

diff --git a/sound/soc/codecs/cs35l41.c b/sound/soc/codecs/cs35l41.c
index 5456e6bfa242fd8d4c8b2a6ac0ab0e951460731b..7ddaa9bd89114206e7ca4161419b93c50f0a0edb 100644 (file)
--- a/sound/soc/codecs/cs35l41.c
+++ b/sound/soc/codecs/cs35l41.c
@@ -1190,16 +1190,14 @@ int cs35l41_probe(struct cs35l41_private *cs35l41, const struct cs35l41_hw_cfg *
 
        ret = devm_regulator_bulk_get(cs35l41->dev, CS35L41_NUM_SUPPLIES,
                                      cs35l41->supplies);
-       if (ret != 0) {
-               dev_err(cs35l41->dev, "Failed to request core supplies: %d\n", ret);
-               return ret;
-       }
+       if (ret != 0)
+               return dev_err_probe(cs35l41->dev, ret,
+                                    "Failed to request core supplies\n");
 
        ret = regulator_bulk_enable(CS35L41_NUM_SUPPLIES, cs35l41->supplies);
-       if (ret != 0) {
-               dev_err(cs35l41->dev, "Failed to enable core supplies: %d\n", ret);
-               return ret;
-       }
+       if (ret != 0)
+               return dev_err_probe(cs35l41->dev, ret,
+                                    "Failed to enable core supplies\n");
 
        /* returning NULL can be an option if in stereo mode */
        cs35l41->reset_gpio = devm_gpiod_get_optional(cs35l41->dev, "reset",
@@ -1211,8 +1209,8 @@ int cs35l41_probe(struct cs35l41_private *cs35l41, const struct cs35l41_hw_cfg *
                        dev_info(cs35l41->dev,
                                 "Reset line busy, assuming shared reset\n");
                } else {
-                       dev_err(cs35l41->dev,
-                               "Failed to get reset GPIO: %d\n", ret);
+                       dev_err_probe(cs35l41->dev, ret,
+                                     "Failed to get reset GPIO\n");
                        goto err;
                }
        }
@@ -1228,8 +1226,8 @@ int cs35l41_probe(struct cs35l41_private *cs35l41, const struct cs35l41_hw_cfg *
                                       int_status, int_status & CS35L41_OTP_BOOT_DONE,
                                       1000, 100000);
        if (ret) {
-               dev_err(cs35l41->dev,
-                       "Failed waiting for OTP_BOOT_DONE: %d\n", ret);
+               dev_err_probe(cs35l41->dev, ret,
+                             "Failed waiting for OTP_BOOT_DONE\n");
                goto err;
        }
 
@@ -1242,13 +1240,13 @@ int cs35l41_probe(struct cs35l41_private *cs35l41, const struct cs35l41_hw_cfg *
 
        ret = regmap_read(cs35l41->regmap, CS35L41_DEVID, &regid);
        if (ret < 0) {
-               dev_err(cs35l41->dev, "Get Device ID failed: %d\n", ret);
+               dev_err_probe(cs35l41->dev, ret, "Get Device ID failed\n");
                goto err;
        }
 
        ret = regmap_read(cs35l41->regmap, CS35L41_REVID, &reg_revid);
        if (ret < 0) {
-               dev_err(cs35l41->dev, "Get Revision ID failed: %d\n", ret);
+               dev_err_probe(cs35l41->dev, ret, "Get Revision ID failed\n");
                goto err;
        }
 
@@ -1273,7 +1271,7 @@ int cs35l41_probe(struct cs35l41_private *cs35l41, const struct cs35l41_hw_cfg *
 
        ret = cs35l41_otp_unpack(cs35l41->dev, cs35l41->regmap);
        if (ret < 0) {
-               dev_err(cs35l41->dev, "OTP Unpack failed: %d\n", ret);
+               dev_err_probe(cs35l41->dev, ret, "OTP Unpack failed\n");
                goto err;
        }
 
@@ -1293,13 +1291,13 @@ int cs35l41_probe(struct cs35l41_private *cs35l41, const struct cs35l41_hw_cfg *
                                        IRQF_ONESHOT | IRQF_SHARED | irq_pol,
                                        "cs35l41", cs35l41);
        if (ret != 0) {
-               dev_err(cs35l41->dev, "Failed to request IRQ: %d\n", ret);
+               dev_err_probe(cs35l41->dev, ret, "Failed to request IRQ\n");
                goto err;
        }
 
        ret = cs35l41_set_pdata(cs35l41);
        if (ret < 0) {
-               dev_err(cs35l41->dev, "Set pdata failed: %d\n", ret);
+               dev_err_probe(cs35l41->dev, ret, "Set pdata failed\n");
                goto err;
        }
 
@@ -1322,7 +1320,7 @@ int cs35l41_probe(struct cs35l41_private *cs35l41, const struct cs35l41_hw_cfg *
                                              &soc_component_dev_cs35l41,
                                              cs35l41_dai, ARRAY_SIZE(cs35l41_dai));
        if (ret < 0) {
-               dev_err(cs35l41->dev, "Register codec failed: %d\n", ret);
+               dev_err_probe(cs35l41->dev, ret, "Register codec failed\n");
                goto err_pm;
        }