ASoC: omap-twl4030: Register jacks at the card level

The jacks are card level elements so use snd_soc_card_jack_new() instead of
snd_soc_jack_new() to register them.

Signed-off-by: Lars-Peter Clausen <[email protected]>
Acked-by: Peter Ujfalusi <[email protected]>
Signed-off-by: Mark Brown <[email protected]>

diff --git a/sound/soc/omap/omap-twl4030.c b/sound/soc/omap/omap-twl4030.c
index fb1f6bb87cd430d816e250a2b5d7317c4744c6a7..3673ada43bfb244fd7a17f90e7bc420e7e020ed1 100644 (file)
--- a/sound/soc/omap/omap-twl4030.c
+++ b/sound/soc/omap/omap-twl4030.c
@@ -170,14 +170,10 @@ static int omap_twl4030_init(struct snd_soc_pcm_runtime *rtd)
        if (priv->jack_detect > 0) {
                hs_jack_gpios[0].gpio = priv->jack_detect;
 
-               ret = snd_soc_jack_new(codec, "Headset Jack", SND_JACK_HEADSET,
-                                      &priv->hs_jack);
-               if (ret)
-                       return ret;
-
-               ret = snd_soc_jack_add_pins(&priv->hs_jack,
-                                           ARRAY_SIZE(hs_jack_pins),
-                                           hs_jack_pins);
+               ret = snd_soc_card_jack_new(rtd->card, "Headset Jack",
+                                           SND_JACK_HEADSET, &priv->hs_jack,
+                                           hs_jack_pins,
+                                           ARRAY_SIZE(hs_jack_pins));
                if (ret)
                        return ret;