ASoC: soc-card: add snd_soc_card_suspend_post()

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/871rn425j3.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 58b6958c0f8b1a5c6cec4706801ef08142aee849..55f15120d7db758fe52a14c487884d01bb6c6ffd 100644 (file)
--- a/include/sound/soc-card.h
+++ b/include/sound/soc-card.h
@@ -20,6 +20,7 @@ int snd_soc_card_jack_new(struct snd_soc_card *card, const char *id, int type,
                          struct snd_soc_jack_pin *pins, unsigned int num_pins);
 
 int snd_soc_card_suspend_pre(struct snd_soc_card *card);
+int snd_soc_card_suspend_post(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 710684c030bc79f7cd6c5eda75e1e7f88a1efef5..d196103225bac1734be10b795c2b058c0771ff38 100644 (file)
--- a/sound/soc/soc-card.c
+++ b/sound/soc/soc-card.c
@@ -89,3 +89,13 @@ int snd_soc_card_suspend_pre(struct snd_soc_card *card)
 
        return soc_card_ret(card, ret);
 }
+
+int snd_soc_card_suspend_post(struct snd_soc_card *card)
+{
+       int ret = 0;
+
+       if (card->suspend_post)
+               ret = card->suspend_post(card);
+
+       return soc_card_ret(card, ret);
+}

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 52d09fa495c3d006286f6782a6d259bc4f19b234..c0327995efc1120dd8092a284bea4234957a8ecf 100644 (file)
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -631,8 +631,7 @@ int snd_soc_suspend(struct device *dev)
                }
        }
 
-       if (card->suspend_post)
-               card->suspend_post(card);
+       snd_soc_card_suspend_post(card);
 
        return 0;
 }