Merge tag 'platform-drivers-x86-v4.1-1' of git://git.infradead.org/users/dvhart/linux...

[firefly-linux-kernel-4.4.55.git] / sound / soc / pxa / palm27x.c

diff --git a/sound/soc/pxa/palm27x.c b/sound/soc/pxa/palm27x.c
index 910336c5ebebd1486048552af7f598b6d7747b0d..c20bbc042425dacb2a478d247f9087b87ba8469c 100644 (file)
--- a/sound/soc/pxa/palm27x.c
+++ b/sound/soc/pxa/palm27x.c
@@ -75,17 +75,12 @@ static struct snd_soc_card palm27x_asoc;
 
 static int palm27x_ac97_init(struct snd_soc_pcm_runtime *rtd)
 {
-       struct snd_soc_codec *codec = rtd->codec;
        int err;
 
        /* Jack detection API stuff */
-       err = snd_soc_jack_new(codec, "Headphone Jack",
-                               SND_JACK_HEADPHONE, &hs_jack);
-       if (err)
-               return err;
-
-       err = snd_soc_jack_add_pins(&hs_jack, ARRAY_SIZE(hs_jack_pins),
-                               hs_jack_pins);
+       err = snd_soc_card_jack_new(rtd->card, "Headphone Jack",
+                                   SND_JACK_HEADPHONE, &hs_jack, hs_jack_pins,
+                                   ARRAY_SIZE(hs_jack_pins));
        if (err)
                return err;