ASoC: adau7118: don't disable regulators on device unbind
authorNuno Sá <nuno.sa@analog.com>
Fri, 24 Feb 2023 10:45:51 +0000 (11:45 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 11 Mar 2023 12:55:30 +0000 (13:55 +0100)
[ Upstream commit b5bfa7277ee7d944421e0ef193586c6e34d7492c ]

The regulators are supposed to be controlled through the
set_bias_level() component callback. Moreover, the regulators are not
enabled during probe and so, this would lead to a regulator unbalanced
use count.

Fixes: ca514c0f12b02 ("ASOC: Add ADAU7118 8 Channel PDM-to-I2S/TDM Converter driver")
Signed-off-by: Nuno Sá <nuno.sa@analog.com>
Link: https://lore.kernel.org/r/20230224104551.1139981-1-nuno.sa@analog.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
sound/soc/codecs/adau7118.c

index bbb0972..a663d37 100644 (file)
@@ -444,22 +444,6 @@ static const struct snd_soc_component_driver adau7118_component_driver = {
        .endianness             = 1,
 };
 
-static void adau7118_regulator_disable(void *data)
-{
-       struct adau7118_data *st = data;
-       int ret;
-       /*
-        * If we fail to disable DVDD, don't bother in trying IOVDD. We
-        * actually don't want to be left in the situation where DVDD
-        * is enabled and IOVDD is disabled.
-        */
-       ret = regulator_disable(st->dvdd);
-       if (ret)
-               return;
-
-       regulator_disable(st->iovdd);
-}
-
 static int adau7118_regulator_setup(struct adau7118_data *st)
 {
        st->iovdd = devm_regulator_get(st->dev, "iovdd");
@@ -481,8 +465,7 @@ static int adau7118_regulator_setup(struct adau7118_data *st)
                regcache_cache_only(st->map, true);
        }
 
-       return devm_add_action_or_reset(st->dev, adau7118_regulator_disable,
-                                       st);
+       return 0;
 }
 
 static int adau7118_parset_dt(const struct adau7118_data *st)