ASoC: broadwell: 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/intel/broadwell.c b/sound/soc/intel/broadwell.c
index 9cf7d01479adcbd82661c70344b5f5d4ad0969fe..9effa3da982f46621e94dd8623186038a3ac8933 100644 (file)
--- a/sound/soc/intel/broadwell.c
+++ b/sound/soc/intel/broadwell.c
@@ -80,15 +80,9 @@ static int broadwell_rt286_codec_init(struct snd_soc_pcm_runtime *rtd)
 {
        struct snd_soc_codec *codec = rtd->codec;
        int ret = 0;
-       ret = snd_soc_jack_new(codec, "Headset",
-               SND_JACK_HEADSET | SND_JACK_BTN_0, &broadwell_headset);
-
-       if (ret)
-               return ret;
-
-       ret = snd_soc_jack_add_pins(&broadwell_headset,
-               ARRAY_SIZE(broadwell_headset_pins),
-               broadwell_headset_pins);
+       ret = snd_soc_card_jack_new(rtd->card, "Headset",
+               SND_JACK_HEADSET | SND_JACK_BTN_0, &broadwell_headset,
+               broadwell_headset_pins, ARRAY_SIZE(broadwell_headset_pins));
        if (ret)
                return ret;