ASoC: Shutdown DAPM contexts when removing a card

Currently when a ASoC sound card is unregistered we leave the individual
components in their current state, just call the remove() callback and leave
it to the drivers to do the proper shutdown/cleanup.

This patch introduces a call to snd_soc_dapm_shutdown() when removing the
card.  This will make sure that all DAPM widgets are properly powered down
and all DAPM contexts are put at the SND_SOC_BIAS_OFF level. This will
ensure that all components are properly powered down when the card is
removed.

Since a lot of drivers manually go to SND_SOC_BIAS_OFF in their remove
callback this will also allow us to remove a bit of duplicated code.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index ff9d2892f473d4d13ec33d38815b4c4e7eafb621..068785fa1a0668c0dfd0706029450d4f56269a33 100644 (file)
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -3812,6 +3812,7 @@ int snd_soc_unregister_card(struct snd_soc_card *card)
 {
        if (card->instantiated) {
                card->instantiated = false;
+               snd_soc_dapm_shutdown(card);
                soc_cleanup_card_resources(card);
        }
        dev_dbg(card->dev, "ASoC: Unregistered card '%s'\n", card->name);