Re: [alsa-devel] [PATCH 12/30] ASoC: omap-twl4030: Register jacks at the card level

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-twl4030.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/sound/soc/omap/omap-twl4030.c b/sound/soc/omap/omap-twl4030.c index fb1f6bb..3673ada 100644 --- a/sound/soc/omap/omap-twl4030.c +++ b/sound/soc/omap/omap-twl4030.c @@ -170,14 +170,10 @@ static int omap_twl4030_init(struct snd_soc_pcm_runtime *rtd) if (priv->jack_detect > 0) { hs_jack_gpios[0].gpio = priv->jack_detect;

• ret = snd_soc_jack_new(codec, "Headset Jack", SND_JACK_HEADSET,
  

• 		       &priv->hs_jack);
  

• if (ret)
  

• 	return ret;
  

• ret = snd_soc_jack_add_pins(&priv->hs_jack,
  

• 			    ARRAY_SIZE(hs_jack_pins),
  

• 			    hs_jack_pins);
  

• ret = snd_soc_card_jack_new(rtd->card, "Headset Jack",
  

• 			    SND_JACK_HEADSET, &priv->hs_jack,
  

• 			    hs_jack_pins,
  

• 			    ARRAY_SIZE(hs_jack_pins));
  

  if (ret) return ret;