diff options
| author | Mark Brown <broonie@kernel.org> | 2015-04-08 22:09:54 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-04-08 22:09:54 +0200 |
| commit | c77dc2c203908fe03582770b016ffc7c84242939 (patch) | |
| tree | c85e844917bb40dbc9f9dc19cdc10af87f5624ea /sound/soc/tegra/tegra_alc5632.c | |
| parent | ASoC: tegra: fix platform_no_drv_owner.cocci warnings (diff) | |
| parent | ASoC: Remove snd_soc_jack_new() (diff) | |
| download | linux-c77dc2c203908fe03582770b016ffc7c84242939.tar.xz linux-c77dc2c203908fe03582770b016ffc7c84242939.zip | |
Merge branch 'topic/jack' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-tegra
Diffstat (limited to 'sound/soc/tegra/tegra_alc5632.c')
| -rw-r--r-- | sound/soc/tegra/tegra_alc5632.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sound/soc/tegra/tegra_alc5632.c b/sound/soc/tegra/tegra_alc5632.c index 769aca2fc5f5..6dcd06a966c7 100644 --- a/sound/soc/tegra/tegra_alc5632.c +++ b/sound/soc/tegra/tegra_alc5632.c @@ -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; |