ASoC: lowland: 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 <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/samsung/lowland.c b/sound/soc/samsung/lowland.c
index 243dea7..5f15609 100644 (file)
--- a/sound/soc/samsung/lowland.c
+++ b/sound/soc/samsung/lowland.c
@@ -56,16 +56,10 @@ static int lowland_wm5100_init(struct snd_soc_pcm_runtime *rtd)
                return ret;
        }
 
-       ret = snd_soc_jack_new(codec, "Headset",
-                              SND_JACK_LINEOUT | SND_JACK_HEADSET |
-                              SND_JACK_BTN_0,
-                              &lowland_headset);
-       if (ret)
-               return ret;
-
-       ret = snd_soc_jack_add_pins(&lowland_headset,
-                                   ARRAY_SIZE(lowland_headset_pins),
-                                   lowland_headset_pins);
+       ret = snd_soc_card_jack_new(rtd->card, "Headset", SND_JACK_LINEOUT |
+                                   SND_JACK_HEADSET | SND_JACK_BTN_0,
+                                   &lowland_headset, lowland_headset_pins,
+                                   ARRAY_SIZE(lowland_headset_pins));
        if (ret)
                return ret;