Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 112daa7a authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: hda - Remove unused variables 



Just clean-up what GCC caught.

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

sound/pci/hda/patch_hdmi.c

+1 −4
Original line number Original line Diff line number Diff line
@@ -1006,7 +1006,6 @@ static int hdmi_add_pin(struct hda_codec *codec, hda_nid_t pin_nid) 
	unsigned int caps, config;

	unsigned int caps, config;

	int pin_idx;

	int pin_idx;

	struct hdmi_spec_per_pin *per_pin;

	struct hdmi_spec_per_pin *per_pin;

	struct hdmi_eld *eld;

	int err;

	int err;





	caps = snd_hda_param_read(codec, pin_nid, AC_PAR_PIN_CAP);

	caps = snd_hda_param_read(codec, pin_nid, AC_PAR_PIN_CAP);
@@ -1023,7 +1022,6 @@ static int hdmi_add_pin(struct hda_codec *codec, hda_nid_t pin_nid) 




	pin_idx = spec->num_pins;

	pin_idx = spec->num_pins;

	per_pin = &spec->pins[pin_idx];

	per_pin = &spec->pins[pin_idx];

	eld = &per_pin->sink_eld;





	per_pin->pin_nid = pin_nid;

	per_pin->pin_nid = pin_nid;
@@ -1576,7 +1574,7 @@ static int nvhdmi_8ch_7x_pcm_prepare(struct hda_pcm_stream *hinfo, 
				     struct snd_pcm_substream *substream)

				     struct snd_pcm_substream *substream)

{

{

	int chs;

	int chs;

	unsigned int dataDCC1, dataDCC2, channel_id;

	unsigned int dataDCC2, channel_id;

	int i;

	int i;

	struct hdmi_spec *spec = codec->spec;

	struct hdmi_spec *spec = codec->spec;

	struct hda_spdif_out *spdif =

	struct hda_spdif_out *spdif =
@@ -1586,7 +1584,6 @@ static int nvhdmi_8ch_7x_pcm_prepare(struct hda_pcm_stream *hinfo, 




	chs = substream->runtime->channels;

	chs = substream->runtime->channels;





	dataDCC1 = AC_DIG1_ENABLE | AC_DIG1_COPYRIGHT;

	dataDCC2 = 0x2;

	dataDCC2 = 0x2;





	/* turn off SPDIF once; otherwise the IEC958 bits won't be updated */

	/* turn off SPDIF once; otherwise the IEC958 bits won't be updated */

sound/pci/hda/patch_realtek.c

+0 −3
Original line number Original line Diff line number Diff line
@@ -2661,7 +2661,6 @@ static int alc_auto_fill_adc_caps(struct hda_codec *codec) 
	hda_nid_t *adc_nids = spec->private_adc_nids;

	hda_nid_t *adc_nids = spec->private_adc_nids;

	hda_nid_t *cap_nids = spec->private_capsrc_nids;

	hda_nid_t *cap_nids = spec->private_capsrc_nids;

	int max_nums = ARRAY_SIZE(spec->private_adc_nids);

	int max_nums = ARRAY_SIZE(spec->private_adc_nids);

	bool indep_capsrc = false;

	int i, nums = 0;

	int i, nums = 0;





	nid = codec->start_nid;

	nid = codec->start_nid;
@@ -2683,13 +2682,11 @@ static int alc_auto_fill_adc_caps(struct hda_codec *codec) 
				break;

				break;

			if (type == AC_WID_AUD_SEL) {

			if (type == AC_WID_AUD_SEL) {

				cap_nids[nums] = src;

				cap_nids[nums] = src;

				indep_capsrc = true;

				break;

				break;

			}

			}

			n = snd_hda_get_conn_list(codec, src, &list);

			n = snd_hda_get_conn_list(codec, src, &list);

			if (n > 1) {

			if (n > 1) {

				cap_nids[nums] = src;

				cap_nids[nums] = src;

				indep_capsrc = true;

				break;

				break;

			} else if (n != 1)

			} else if (n != 1)

				break;

				break;

sound/pci/hda/patch_via.c

+0 −5
Original line number Original line Diff line number Diff line
@@ -3700,13 +3700,8 @@ static const struct hda_verb vt1812_init_verbs[] = { 
static void set_widgets_power_state_vt1812(struct hda_codec *codec)

static void set_widgets_power_state_vt1812(struct hda_codec *codec)

{

{

	struct via_spec *spec = codec->spec;

	struct via_spec *spec = codec->spec;

	int imux_is_smixer =

	snd_hda_codec_read(codec, 0x13, 0, AC_VERB_GET_CONNECT_SEL, 0x00) == 3;

	unsigned int parm;

	unsigned int parm;

	unsigned int present;

	unsigned int present;

	/* MUX10 (1eh) = stereo mixer */

	imux_is_smixer =

	snd_hda_codec_read(codec, 0x1e, 0, AC_VERB_GET_CONNECT_SEL, 0x00) == 5;

	/* inputs */

	/* inputs */

	/* PW 5/6/7 (29h/2ah/2bh) */

	/* PW 5/6/7 (29h/2ah/2bh) */

	parm = AC_PWRST_D3;

	parm = AC_PWRST_D3;