ASoC: tegra_alc5632: Register jacks at the card level
authorLars-Peter Clausen <lars@metafoo.de>
Wed, 4 Mar 2015 09:33:40 +0000 (10:33 +0100)
committerMark Brown <broonie@kernel.org>
Wed, 4 Mar 2015 17:10:46 +0000 (17:10 +0000)
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>
sound/soc/tegra/tegra_alc5632.c

index 769aca2..6dcd06a 100644 (file)
@@ -106,11 +106,10 @@ static int tegra_alc5632_asoc_init(struct snd_soc_pcm_runtime *rtd)
        struct snd_soc_dapm_context *dapm = &codec->dapm;
        struct tegra_alc5632 *machine = snd_soc_card_get_drvdata(rtd->card);
 
-       snd_soc_jack_new(codec, "Headset Jack", SND_JACK_HEADSET,
-                        &tegra_alc5632_hs_jack);
-       snd_soc_jack_add_pins(&tegra_alc5632_hs_jack,
-                       ARRAY_SIZE(tegra_alc5632_hs_jack_pins),
-                       tegra_alc5632_hs_jack_pins);
+       snd_soc_card_jack_new(rtd->card, "Headset Jack", SND_JACK_HEADSET,
+                             &tegra_alc5632_hs_jack,
+                             tegra_alc5632_hs_jack_pins,
+                             ARRAY_SIZE(tegra_alc5632_hs_jack_pins));
 
        if (gpio_is_valid(machine->gpio_hp_det)) {
                tegra_alc5632_hp_jack_gpio.gpio = machine->gpio_hp_det;