tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

ALSA: rename "PC Speaker" controls to "Speaker"

To unify control names, rename "PC Speaker" to "Speaker" for PPC ALSA drivers.

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

authored by

Jaroslav Kysela and committed by
Takashi Iwai ad1cd745 d355c82a

+13 -12
+1 -1
Documentation/sound/alsa/ControlNames.txt
··· 18 18 Master 19 19 Master Mono 20 20 Hardware Master 21 - Internal Speaker 21 + Speaker (internal speaker) 22 22 Headphone 23 23 Beep (beep generator) 24 24 Phone
+1
sound/core/oss/mixer_oss.c
··· 1253 1253 { SOUND_MIXER_PCM, "PCM", 0 }, 1254 1254 { SOUND_MIXER_SPEAKER, "Beep", 0 }, 1255 1255 { SOUND_MIXER_SPEAKER, "PC Speaker", 0 }, /* fallback */ 1256 + { SOUND_MIXER_SPEAKER, "Speaker", 0 }, /* fallback */ 1256 1257 { SOUND_MIXER_LINE, "Line", 0 }, 1257 1258 { SOUND_MIXER_MIC, "Mic", 0 }, 1258 1259 { SOUND_MIXER_CD, "CD", 0 },
+6 -6
sound/ppc/awacs.c
··· 479 479 480 480 static struct snd_kcontrol_new snd_pmac_awacs_amp_vol[] __devinitdata = { 481 481 { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, 482 - .name = "PC Speaker Playback Volume", 482 + .name = "Speaker Playback Volume", 483 483 .info = snd_pmac_awacs_info_volume_amp, 484 484 .get = snd_pmac_awacs_get_volume_amp, 485 485 .put = snd_pmac_awacs_put_volume_amp, ··· 525 525 526 526 static struct snd_kcontrol_new snd_pmac_awacs_amp_spk_sw __devinitdata = { 527 527 .iface = SNDRV_CTL_ELEM_IFACE_MIXER, 528 - .name = "PC Speaker Playback Switch", 528 + .name = "Speaker Playback Switch", 529 529 .info = snd_pmac_boolean_stereo_info, 530 530 .get = snd_pmac_awacs_get_switch_amp, 531 531 .put = snd_pmac_awacs_put_switch_amp, ··· 696 696 }; 697 697 698 698 static struct snd_kcontrol_new snd_pmac_awacs_speaker_vol[] __devinitdata = { 699 - AWACS_VOLUME("PC Speaker Playback Volume", 4, 6, 1), 699 + AWACS_VOLUME("Speaker Playback Volume", 4, 6, 1), 700 700 }; 701 701 702 702 static struct snd_kcontrol_new snd_pmac_awacs_speaker_sw __devinitdata = 703 - AWACS_SWITCH("PC Speaker Playback Switch", 1, SHIFT_SPKMUTE, 1); 703 + AWACS_SWITCH("Speaker Playback Switch", 1, SHIFT_SPKMUTE, 1); 704 704 705 705 static struct snd_kcontrol_new snd_pmac_awacs_speaker_sw_imac1 __devinitdata = 706 - AWACS_SWITCH("PC Speaker Playback Switch", 1, SHIFT_PAROUT1, 1); 706 + AWACS_SWITCH("Speaker Playback Switch", 1, SHIFT_PAROUT1, 1); 707 707 708 708 static struct snd_kcontrol_new snd_pmac_awacs_speaker_sw_imac2 __devinitdata = 709 - AWACS_SWITCH("PC Speaker Playback Switch", 1, SHIFT_PAROUT1, 0); 709 + AWACS_SWITCH("Speaker Playback Switch", 1, SHIFT_PAROUT1, 0); 710 710 711 711 712 712 /*
+4 -4
sound/ppc/burgundy.c
··· 505 505 MASK_ADDR_BURGUNDY_GAINLINE, 1, 0), 506 506 BURGUNDY_VOLUME_B("Mic Gain Capture Volume", 0, 507 507 MASK_ADDR_BURGUNDY_GAINMIC, 1, 0), 508 - BURGUNDY_VOLUME_B("PC Speaker Playback Volume", 0, 508 + BURGUNDY_VOLUME_B("Speaker Playback Volume", 0, 509 509 MASK_ADDR_BURGUNDY_ATTENSPEAKER, 1, 1), 510 510 BURGUNDY_VOLUME_B("Line out Playback Volume", 0, 511 511 MASK_ADDR_BURGUNDY_ATTENLINEOUT, 1, 1), ··· 527 527 MASK_ADDR_BURGUNDY_VOLMIC, 16), 528 528 BURGUNDY_VOLUME_B("Line in Gain Capture Volume", 0, 529 529 MASK_ADDR_BURGUNDY_GAINMIC, 1, 0), 530 - BURGUNDY_VOLUME_B("PC Speaker Playback Volume", 0, 530 + BURGUNDY_VOLUME_B("Speaker Playback Volume", 0, 531 531 MASK_ADDR_BURGUNDY_ATTENMONO, 0, 1), 532 532 BURGUNDY_VOLUME_B("Line out Playback Volume", 0, 533 533 MASK_ADDR_BURGUNDY_ATTENSPEAKER, 1, 1), ··· 549 549 BURGUNDY_OUTPUT_INTERN 550 550 | BURGUNDY_OUTPUT_LEFT, BURGUNDY_OUTPUT_RIGHT, 1); 551 551 static struct snd_kcontrol_new snd_pmac_burgundy_speaker_sw_imac __devinitdata = 552 - BURGUNDY_SWITCH_B("PC Speaker Playback Switch", 0, 552 + BURGUNDY_SWITCH_B("Speaker Playback Switch", 0, 553 553 MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES, 554 554 BURGUNDY_OUTPUT_LEFT, BURGUNDY_OUTPUT_RIGHT, 1); 555 555 static struct snd_kcontrol_new snd_pmac_burgundy_speaker_sw_pmac __devinitdata = 556 - BURGUNDY_SWITCH_B("PC Speaker Playback Switch", 0, 556 + BURGUNDY_SWITCH_B("Speaker Playback Switch", 0, 557 557 MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES, 558 558 BURGUNDY_OUTPUT_INTERN, 0, 0); 559 559 static struct snd_kcontrol_new snd_pmac_burgundy_line_sw_imac __devinitdata =
+1 -1
sound/ppc/tumbler.c
··· 905 905 }; 906 906 static struct snd_kcontrol_new tumbler_speaker_sw __devinitdata = { 907 907 .iface = SNDRV_CTL_ELEM_IFACE_MIXER, 908 - .name = "PC Speaker Playback Switch", 908 + .name = "Speaker Playback Switch", 909 909 .info = snd_pmac_boolean_mono_info, 910 910 .get = tumbler_get_mute_switch, 911 911 .put = tumbler_put_mute_switch,