diff options
| author | Tzung-Bi Shih <tzungbi@google.com> | 2019-05-22 22:55:05 +0800 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-05-23 14:34:36 +0100 |
| commit | 108d0d40b932f80fc7f1dbd1de548d666e649a4b (patch) | |
| tree | e813708409d2c65db60e04685c3314a5146cda20 /sound/soc/mediatek | |
| parent | 5463eb5c2f758069d1db21ed2cf23339431c9481 (diff) | |
| download | linux-108d0d40b932f80fc7f1dbd1de548d666e649a4b.tar.gz | |
ASoC: mediatek: mt8183: remove unused DAPM pins
Kernel emits the following messages when booting. ASoC: DAPM unknown pin Headset Mic ASoC: DAPM unknown pin Headphone Remove the unused DAPM pins. Signed-off-by: Tzung-Bi Shih <tzungbi@google.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/mediatek')
| -rw-r--r-- | sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c | 15 | ||||
| -rw-r--r-- | sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c | 16 |
2 files changed, 2 insertions, 29 deletions
diff --git a/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c b/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c index 31ea8632c397..231fb49d79b9 100644 --- a/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c +++ b/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c @@ -18,18 +18,6 @@ static struct snd_soc_jack headset_jack; -/* Headset jack detection DAPM pins */ -static struct snd_soc_jack_pin headset_jack_pins[] = { - { - .pin = "Headphone", - .mask = SND_JACK_HEADPHONE, - }, - { - .pin = "Headset Mic", - .mask = SND_JACK_MICROPHONE, - }, -}; - static struct snd_soc_dai_link_component mt8183_da7219_max98357_external_codecs[] = { { @@ -375,8 +363,7 @@ mt8183_da7219_max98357_headset_init(struct snd_soc_component *component) SND_JACK_BTN_0 | SND_JACK_BTN_1 | SND_JACK_BTN_2 | SND_JACK_BTN_3, &headset_jack, - headset_jack_pins, - ARRAY_SIZE(headset_jack_pins)); + NULL, 0); if (ret) return ret; diff --git a/sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c b/sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c index 4e44e5689d6f..1ba7aa58e4b6 100644 --- a/sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c +++ b/sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c @@ -17,19 +17,6 @@ static struct snd_soc_jack headset_jack; -/* Headset jack detection DAPM pins */ -static struct snd_soc_jack_pin headset_jack_pins[] = { - { - .pin = "Headphone", - .mask = SND_JACK_HEADPHONE, - }, - { - .pin = "Headset Mic", - .mask = SND_JACK_MICROPHONE, - }, - -}; - static int mt8183_mt6358_i2s_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { @@ -328,8 +315,7 @@ mt8183_mt6358_ts3a227_max98357_headset_init(struct snd_soc_component *component) SND_JACK_BTN_0 | SND_JACK_BTN_1 | SND_JACK_BTN_2 | SND_JACK_BTN_3, &headset_jack, - headset_jack_pins, - ARRAY_SIZE(headset_jack_pins)); + NULL, 0); if (ret) return ret; |