diff options
| author | Oder Chiou <oder_chiou@realtek.com> | 2018-05-15 14:00:15 +0800 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-05-17 13:33:23 +0900 |
| commit | 37a0491116994ba92ec94a98aa6bfbe8f8d7236f (patch) | |
| tree | 5af71b5853d08b7da861b9ff228b39ca9c4228b7 /sound/soc/intel | |
| parent | 1cc0fe247958e5ae359e42e4d3cae1cf4f3c8136 (diff) | |
| download | linux-37a0491116994ba92ec94a98aa6bfbe8f8d7236f.tar.gz linux-37a0491116994ba92ec94a98aa6bfbe8f8d7236f.tar.bz2 linux-37a0491116994ba92ec94a98aa6bfbe8f8d7236f.zip | |
ASoC: rt5663: Use the set_jack() instead of the export function
The patch replaces the export function with the new API set_jack().
Signed-off-by: Oder Chiou <oder_chiou@realtek.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/intel')
| -rw-r--r-- | sound/soc/intel/boards/kbl_rt5663_max98927.c | 3 | ||||
| -rw-r--r-- | sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/sound/soc/intel/boards/kbl_rt5663_max98927.c b/sound/soc/intel/boards/kbl_rt5663_max98927.c index 513cc65a77be..3a61252fe450 100644 --- a/sound/soc/intel/boards/kbl_rt5663_max98927.c +++ b/sound/soc/intel/boards/kbl_rt5663_max98927.c @@ -299,7 +299,8 @@ static int kabylake_rt5663_codec_init(struct snd_soc_pcm_runtime *rtd) snd_jack_set_key(jack->jack, SND_JACK_BTN_2, KEY_VOLUMEUP); snd_jack_set_key(jack->jack, SND_JACK_BTN_3, KEY_VOLUMEDOWN); - rt5663_set_jack_detect(component, &ctx->kabylake_headset); + snd_soc_component_set_jack(component, &ctx->kabylake_headset, NULL); + return ret; } diff --git a/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c b/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c index e8382d6bbd8c..92f5fb2ae0a3 100644 --- a/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c +++ b/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c @@ -200,7 +200,7 @@ static int kabylake_rt5663_codec_init(struct snd_soc_pcm_runtime *rtd) snd_jack_set_key(jack->jack, SND_JACK_BTN_2, KEY_VOLUMEUP); snd_jack_set_key(jack->jack, SND_JACK_BTN_3, KEY_VOLUMEDOWN); - rt5663_set_jack_detect(component, &ctx->kabylake_headset); + snd_soc_component_set_jack(component, &ctx->kabylake_headset, NULL); ret = snd_soc_dapm_ignore_suspend(&rtd->card->dapm, "DMIC"); if (ret) |