ASoC: tobermory: 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/tobermory.c b/sound/soc/samsung/tobermory.c
index 9c80506527c4f3c87620fd48235f9e6f3e737834..85ccfb7188cb2d4b36101f14d0fa3dc024436f6f 100644 (file)
--- a/sound/soc/samsung/tobermory.c
+++ b/sound/soc/samsung/tobermory.c
@@ -179,15 +179,10 @@ static int tobermory_late_probe(struct snd_soc_card *card)
        if (ret < 0)
                return ret;
 
-       ret = snd_soc_jack_new(codec, "Headset",
-                              SND_JACK_HEADSET | SND_JACK_BTN_0,
-                              &tobermory_headset);
-       if (ret)
-               return ret;
-
-       ret = snd_soc_jack_add_pins(&tobermory_headset,
-                                   ARRAY_SIZE(tobermory_headset_pins),
-                                   tobermory_headset_pins);
+       ret = snd_soc_card_jack_new(card, "Headset", SND_JACK_HEADSET |
+                                   SND_JACK_BTN_0, &tobermory_headset,
+                                   tobermory_headset_pins,
+                                   ARRAY_SIZE(tobermory_headset_pins));
        if (ret)
                return ret;