| Message ID | 1425461626-21103-12-git-send-email-lars@metafoo.de (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 25649592cfa6c210c9f86670472b864782c8d677 |
| Headers | show |
On 03/04/2015 11:33 AM, Lars-Peter Clausen wrote: > The jacks are card level elements so use snd_soc_card_jack_new() instead of > snd_soc_jack_new() to register them. Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com> > > Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> > --- > sound/soc/omap/omap-abe-twl6040.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/sound/soc/omap/omap-abe-twl6040.c b/sound/soc/omap/omap-abe-twl6040.c > index b9c65f1..0843a68 100644 > --- a/sound/soc/omap/omap-abe-twl6040.c > +++ b/sound/soc/omap/omap-abe-twl6040.c > @@ -182,17 +182,17 @@ static int omap_abe_twl6040_init(struct snd_soc_pcm_runtime *rtd) > > /* Headset jack detection only if it is supported */ > if (priv->jack_detection) { > - ret = snd_soc_jack_new(codec, "Headset Jack", > - SND_JACK_HEADSET, &hs_jack); > + ret = snd_soc_card_jack_new(rtd->card, "Headset Jack", > + SND_JACK_HEADSET, &hs_jack, > + hs_jack_pins, > + ARRAY_SIZE(hs_jack_pins)); > if (ret) > return ret; > > - ret = snd_soc_jack_add_pins(&hs_jack, ARRAY_SIZE(hs_jack_pins), > - hs_jack_pins); > twl6040_hs_jack_detect(codec, &hs_jack, SND_JACK_HEADSET); > } > > - return ret; > + return 0; > } > > static const struct snd_soc_dapm_route dmic_audio_map[] = { >
diff --git a/sound/soc/omap/omap-abe-twl6040.c b/sound/soc/omap/omap-abe-twl6040.c index b9c65f1..0843a68 100644 --- a/sound/soc/omap/omap-abe-twl6040.c +++ b/sound/soc/omap/omap-abe-twl6040.c @@ -182,17 +182,17 @@ static int omap_abe_twl6040_init(struct snd_soc_pcm_runtime *rtd) /* Headset jack detection only if it is supported */ if (priv->jack_detection) { - ret = snd_soc_jack_new(codec, "Headset Jack", - SND_JACK_HEADSET, &hs_jack); + ret = snd_soc_card_jack_new(rtd->card, "Headset Jack", + SND_JACK_HEADSET, &hs_jack, + hs_jack_pins, + ARRAY_SIZE(hs_jack_pins)); if (ret) return ret; - ret = snd_soc_jack_add_pins(&hs_jack, ARRAY_SIZE(hs_jack_pins), - hs_jack_pins); twl6040_hs_jack_detect(codec, &hs_jack, SND_JACK_HEADSET); } - return ret; + return 0; } static const struct snd_soc_dapm_route dmic_audio_map[] = {
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> --- sound/soc/omap/omap-abe-twl6040.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)