ASoC: codecs: tlv320aic31xx: Use dev_err_probe() helper

Use the dev_err_probe() helper, instead of open-coding the same
operation.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/20211214020843.2225831-11-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/tlv320aic31xx.c b/sound/soc/codecs/tlv320aic31xx.c
index 4224b4b3cae6289c6a52f9878b500b552336ebcf..e77342aff46d078ef2f6ff0d7dbfa67e774edccb 100644 (file)
--- a/sound/soc/codecs/tlv320aic31xx.c
+++ b/sound/soc/codecs/tlv320aic31xx.c
@@ -1680,11 +1680,9 @@ static int aic31xx_i2c_probe(struct i2c_client *i2c,
 
        aic31xx->gpio_reset = devm_gpiod_get_optional(aic31xx->dev, "reset",
                                                      GPIOD_OUT_LOW);
-       if (IS_ERR(aic31xx->gpio_reset)) {
-               if (PTR_ERR(aic31xx->gpio_reset) != -EPROBE_DEFER)
-                       dev_err(aic31xx->dev, "not able to acquire gpio\n");
-               return PTR_ERR(aic31xx->gpio_reset);
-       }
+       if (IS_ERR(aic31xx->gpio_reset))
+               return dev_err_probe(aic31xx->dev, PTR_ERR(aic31xx->gpio_reset),
+                                    "not able to acquire gpio\n");
 
        for (i = 0; i < ARRAY_SIZE(aic31xx->supplies); i++)
                aic31xx->supplies[i].supply = aic31xx_supply_names[i];
@@ -1692,12 +1690,8 @@ static int aic31xx_i2c_probe(struct i2c_client *i2c,
        ret = devm_regulator_bulk_get(aic31xx->dev,
                                      ARRAY_SIZE(aic31xx->supplies),
                                      aic31xx->supplies);
-       if (ret) {
-               if (ret != -EPROBE_DEFER)
-                       dev_err(aic31xx->dev,
-                               "Failed to request supplies: %d\n", ret);
-               return ret;
-       }
+       if (ret)
+               return dev_err_probe(aic31xx->dev, ret, "Failed to request supplies\n");
 
        aic31xx_configure_ocmv(aic31xx);