ASoC: tlv320aic31xx: suppress error message for EPROBE_DEFER
authorLucas Stach <l.stach@pengutronix.de>
Fri, 19 Jul 2019 14:36:37 +0000 (16:36 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 5 Oct 2019 11:09:33 +0000 (13:09 +0200)
[ Upstream commit b7e814deae33eb30f8f8c6528e8e69b107978d88 ]

Both the supplies and reset GPIO might need a probe deferral for the
resource to be available. Don't print a error message in that case, as
it is a normal operating condition.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Acked-by: Andrew F. Davis <afd@ti.com>
Link: https://lore.kernel.org/r/20190719143637.2018-1-l.stach@pengutronix.de
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
sound/soc/codecs/tlv320aic31xx.c

index bf92d36..3c75dcf 100644 (file)
@@ -1441,7 +1441,8 @@ 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)) {
-               dev_err(aic31xx->dev, "not able to acquire gpio\n");
+               if (PTR_ERR(aic31xx->gpio_reset) != -EPROBE_DEFER)
+                       dev_err(aic31xx->dev, "not able to acquire gpio\n");
                return PTR_ERR(aic31xx->gpio_reset);
        }
 
@@ -1452,7 +1453,9 @@ static int aic31xx_i2c_probe(struct i2c_client *i2c,
                                      ARRAY_SIZE(aic31xx->supplies),
                                      aic31xx->supplies);
        if (ret) {
-               dev_err(aic31xx->dev, "Failed to request supplies: %d\n", ret);
+               if (ret != -EPROBE_DEFER)
+                       dev_err(aic31xx->dev,
+                               "Failed to request supplies: %d\n", ret);
                return ret;
        }