Commit e49a3434 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: hda - Kill hyphenated names 



Kill hyphens from "Line-Out" name strings, as suggested by Mark Brown.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent b3999970

sound/pci/hda/hda_codec.c

+2 −2
Original line number Diff line number Diff line
@@ -5118,7 +5118,7 @@ static int fill_audio_out_name(struct hda_codec *codec, hda_nid_t nid, 
	const char *pfx = "", *sfx = "";



	/* handle as a speaker if it's a fixed line-out */

	if (!strcmp(name, "Line-Out") && attr == INPUT_PIN_ATTR_INT)

	if (!strcmp(name, "Line Out") && attr == INPUT_PIN_ATTR_INT)

		name = "Speaker";

	/* check the location */

	switch (attr) {
@@ -5177,7 +5177,7 @@ int snd_hda_get_pin_label(struct hda_codec *codec, hda_nid_t nid, 


	switch (get_defcfg_device(def_conf)) {

	case AC_JACK_LINE_OUT:

		return fill_audio_out_name(codec, nid, cfg, "Line-Out",

		return fill_audio_out_name(codec, nid, cfg, "Line Out",

					   label, maxlen, indexp);

	case AC_JACK_SPEAKER:

		return fill_audio_out_name(codec, nid, cfg, "Speaker",

sound/pci/hda/patch_cirrus.c

+2 −2
Original line number Diff line number Diff line
@@ -609,7 +609,7 @@ static int add_output(struct hda_codec *codec, hda_nid_t dac, int idx, 
		"Front Speaker", "Surround Speaker", "Bass Speaker"

	};

	static const char * const line_outs[] = {

		"Front Line-Out", "Surround Line-Out", "Bass Line-Out"

		"Front Line Out", "Surround Line Out", "Bass Line Out"

	};



	fix_volume_caps(codec, dac);
@@ -635,7 +635,7 @@ static int add_output(struct hda_codec *codec, hda_nid_t dac, int idx, 
		if (num_ctls > 1)

			name = line_outs[idx];

		else

			name = "Line-Out";

			name = "Line Out";

		break;

	}

sound/pci/hda/patch_conexant.c

+1 −1
Original line number Diff line number Diff line
@@ -3482,7 +3482,7 @@ static int cx_automute_mode_info(struct snd_kcontrol *kcontrol, 
		"Disabled", "Enabled"

	};

	static const char * const texts3[] = {

		"Disabled", "Speaker Only", "Line-Out+Speaker"

		"Disabled", "Speaker Only", "Line Out+Speaker"

	};

	const char * const *texts;

sound/pci/hda/patch_realtek.c

+3 −3
Original line number Diff line number Diff line
@@ -802,7 +802,7 @@ static int alc_automute_mode_info(struct snd_kcontrol *kcontrol, 
		"Disabled", "Enabled"

	};

	static const char * const texts3[] = {

		"Disabled", "Speaker Only", "Line-Out+Speaker"

		"Disabled", "Speaker Only", "Line Out+Speaker"

	};

	const char * const *texts;
@@ -1856,7 +1856,7 @@ static const char * const alc_slave_vols[] = { 
	"Headphone Playback Volume",

	"Speaker Playback Volume",

	"Mono Playback Volume",

	"Line-Out Playback Volume",

	"Line Out Playback Volume",

	"CLFE Playback Volume",

	"Bass Speaker Playback Volume",

	"PCM Playback Volume",
@@ -1873,7 +1873,7 @@ static const char * const alc_slave_sws[] = { 
	"Speaker Playback Switch",

	"Mono Playback Switch",

	"IEC958 Playback Switch",

	"Line-Out Playback Switch",

	"Line Out Playback Switch",

	"CLFE Playback Switch",

	"Bass Speaker Playback Switch",

	"PCM Playback Switch",