diff options
author | Takashi Iwai <tiwai@suse.de> | 2023-03-03 16:21:13 +0300 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2023-03-03 16:21:13 +0300 |
commit | fb2e5fc8c8d9d5f95c7a2e1ed6f45b2b3ba836a8 (patch) | |
tree | 636387e1c12bfe74304e6d56b445f94f50b10466 /sound/soc/codecs/adau7118.c | |
parent | 26ed1d29fc44f3f2f0c396c1392abefac5f0454e (diff) | |
parent | b56ec2992a2e43bc3e60d6db86849d31640e791f (diff) | |
download | linux-fb2e5fc8c8d9d5f95c7a2e1ed6f45b2b3ba836a8.tar.xz |
Merge tag 'asoc-fix-v6.3' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v6.3
Almost all of this is driver specific fixes and new IDs that have come
in during the merge window. A good chunk of them are simple ones from
me which came about due to a bunch of Mediatek Chromebooks being enabled
in KernelCI, there's more where that came from.
We do have one small feature added to the PCM core by Claudiu Beznea in
order to allow the sequencing required to resolve a noise issue with the
Microchip PDMC driver.
Diffstat (limited to 'sound/soc/codecs/adau7118.c')
-rw-r--r-- | sound/soc/codecs/adau7118.c | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/sound/soc/codecs/adau7118.c b/sound/soc/codecs/adau7118.c index bbb097249887..a663d37e5776 100644 --- a/sound/soc/codecs/adau7118.c +++ b/sound/soc/codecs/adau7118.c @@ -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) |