ASoC: soc-card: add snd_soc_card_resume_pre()

Card related function should be implemented at soc-card now.
This patch adds it.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/87zh9szv5k.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/include/sound/soc-card.h b/include/sound/soc-card.h
index 55f15120d7db758fe52a14c487884d01bb6c6ffd..23490df0f1894f21a57b44fa7013b30b78a86c58 100644 (file)
--- a/include/sound/soc-card.h
+++ b/include/sound/soc-card.h
@@ -21,6 +21,7 @@ int snd_soc_card_jack_new(struct snd_soc_card *card, const char *id, int type,
 
 int snd_soc_card_suspend_pre(struct snd_soc_card *card);
 int snd_soc_card_suspend_post(struct snd_soc_card *card);
+int snd_soc_card_resume_pre(struct snd_soc_card *card);
 
 /* device driver data */
 static inline void snd_soc_card_set_drvdata(struct snd_soc_card *card,

diff --git a/sound/soc/soc-card.c b/sound/soc/soc-card.c
index d196103225bac1734be10b795c2b058c0771ff38..78dc305684165cdadcd022f9c84ac3fd4b163287 100644 (file)
--- a/sound/soc/soc-card.c
+++ b/sound/soc/soc-card.c
@@ -99,3 +99,13 @@ int snd_soc_card_suspend_post(struct snd_soc_card *card)
 
        return soc_card_ret(card, ret);
 }
+
+int snd_soc_card_resume_pre(struct snd_soc_card *card)
+{
+       int ret = 0;
+
+       if (card->resume_pre)
+               ret = card->resume_pre(card);
+
+       return soc_card_ret(card, ret);
+}

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index c0327995efc1120dd8092a284bea4234957a8ecf..540ee055a1e8c8a25c4a2da6bbb496a9e4ec6cf8 100644 (file)
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -660,8 +660,7 @@ static void soc_resume_deferred(struct work_struct *work)
        /* Bring us up into D2 so that DAPM starts enabling things */
        snd_power_change_state(card->snd_card, SNDRV_CTL_POWER_D2);
 
-       if (card->resume_pre)
-               card->resume_pre(card);
+       snd_soc_card_resume_pre(card);
 
        for_each_card_components(card, component) {
                if (snd_soc_component_is_suspended(component))