ASoC: simple-card: move hp and mic detection to soc_card probe

This patch moves headphone and microphone detection to probe() of
snd_soc_card from init() of snd_soc_dai_link. This is because init()
is called (and an input device /dev/input/eventX is created too)
twice or above if simple card has two or more DAI links.

Signed-off-by: Katsuhiro Suzuki <suzuki.katsuhiro@socionext.com>
Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c
index a6477a022156fd2f83e7de18a768949540f2d300..c5b6e04cd9261d80de4646fdae588c93b87230c7 100644 (file)
--- a/sound/soc/generic/simple-card.c
+++ b/sound/soc/generic/simple-card.c
@@ -149,14 +149,6 @@ static int asoc_simple_card_dai_init(struct snd_soc_pcm_runtime *rtd)
        if (ret < 0)
                return ret;
 
-       ret = asoc_simple_card_init_hp(rtd->card, &priv->hp_jack, PREFIX);
-       if (ret < 0)
-               return ret;
-
-       ret = asoc_simple_card_init_mic(rtd->card, &priv->mic_jack, PREFIX);
-       if (ret < 0)
-               return ret;
-
        return 0;
 }
 
@@ -350,6 +342,22 @@ card_parse_end:
        return ret;
 }
 
+static int asoc_simple_soc_card_probe(struct snd_soc_card *card)
+{
+       struct simple_card_data *priv = snd_soc_card_get_drvdata(card);
+       int ret;
+
+       ret = asoc_simple_card_init_hp(card, &priv->hp_jack, PREFIX);
+       if (ret < 0)
+               return ret;
+
+       ret = asoc_simple_card_init_mic(card, &priv->mic_jack, PREFIX);
+       if (ret < 0)
+               return ret;
+
+       return 0;
+}
+
 static int asoc_simple_card_probe(struct platform_device *pdev)
 {
        struct simple_card_data *priv;
@@ -385,6 +393,7 @@ static int asoc_simple_card_probe(struct platform_device *pdev)
        card->dev               = dev;
        card->dai_link          = priv->dai_link;
        card->num_links         = num;
+       card->probe             = asoc_simple_soc_card_probe;
 
        if (np && of_device_is_available(np)) {