Skip to content

Commit 6490bec

Browse files
Amadeusz Sławińskibroonie
authored andcommitted
ASoC: Intel: avs: boards: Properly name input device
Machine boards expose input device for use with userspace. Current name in some cases is incorrect, fix it. Reviewed-by: Cezary Rojewski <cezary.rojewski@intel.com> Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com> Link: https://lore.kernel.org/r/20240506121106.3792340-1-amadeuszx.slawinski@linux.intel.com Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent 09068d6 commit 6490bec

File tree

5 files changed

+8
-7
lines changed

5 files changed

+8
-7
lines changed

sound/soc/intel/avs/boards/es8336.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ static int avs_es8336_codec_init(struct snd_soc_pcm_runtime *runtime)
113113
if (!pins)
114114
return -ENOMEM;
115115

116-
ret = snd_soc_card_jack_new_pins(card, "Headset", SND_JACK_HEADSET | SND_JACK_BTN_0,
116+
ret = snd_soc_card_jack_new_pins(card, "Headset Jack", SND_JACK_HEADSET | SND_JACK_BTN_0,
117117
&data->jack, pins, num_pins);
118118
if (ret)
119119
return ret;

sound/soc/intel/avs/boards/nau8825.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ static int avs_nau8825_codec_init(struct snd_soc_pcm_runtime *runtime)
9696
* 4 buttons here map to the google Reference headset.
9797
* The use of these buttons can be decided by the user space.
9898
*/
99-
ret = snd_soc_card_jack_new_pins(card, "Headset", SND_JACK_HEADSET | SND_JACK_BTN_0 |
99+
ret = snd_soc_card_jack_new_pins(card, "Headset Jack", SND_JACK_HEADSET | SND_JACK_BTN_0 |
100100
SND_JACK_BTN_1 | SND_JACK_BTN_2 | SND_JACK_BTN_3,
101101
jack, pins, num_pins);
102102
if (ret)

sound/soc/intel/avs/boards/rt274.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,8 @@ static int avs_rt274_codec_init(struct snd_soc_pcm_runtime *runtime)
102102
if (!pins)
103103
return -ENOMEM;
104104

105-
ret = snd_soc_card_jack_new_pins(card, "Headset", SND_JACK_HEADSET, jack, pins, num_pins);
105+
ret = snd_soc_card_jack_new_pins(card, "Headset Jack", SND_JACK_HEADSET, jack, pins,
106+
num_pins);
106107
if (ret)
107108
return ret;
108109

sound/soc/intel/avs/boards/rt286.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ static int avs_rt286_codec_init(struct snd_soc_pcm_runtime *runtime)
6363
if (!pins)
6464
return -ENOMEM;
6565

66-
ret = snd_soc_card_jack_new_pins(card, "Headset", SND_JACK_HEADSET | SND_JACK_BTN_0, jack,
67-
pins, num_pins);
66+
ret = snd_soc_card_jack_new_pins(card, "Headset Jack", SND_JACK_HEADSET | SND_JACK_BTN_0,
67+
jack, pins, num_pins);
6868
if (ret)
6969
return ret;
7070

sound/soc/intel/avs/boards/rt298.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ static int avs_rt298_codec_init(struct snd_soc_pcm_runtime *runtime)
7474
if (!pins)
7575
return -ENOMEM;
7676

77-
ret = snd_soc_card_jack_new_pins(card, "Headset", SND_JACK_HEADSET | SND_JACK_BTN_0, jack,
78-
pins, num_pins);
77+
ret = snd_soc_card_jack_new_pins(card, "Headset Jack", SND_JACK_HEADSET | SND_JACK_BTN_0,
78+
jack, pins, num_pins);
7979
if (ret)
8080
return ret;
8181

0 commit comments

Comments
 (0)