Commit 5e26dfd0 authored by Jaroslav Kysela's avatar Jaroslav Kysela
Browse files

ALSA: hda - simplify usage of HDA_SUBDEV_AMP_FLAG 



The HDA_SUBDEV_NID_FLAG is duplicate for amplifier control elements. Move
get_amp_nid_() call to the snd_hda_ctl_add() function.

Signed-off-by: default avatarJaroslav Kysela <perex@perex.cz>
parent 9e3fd871

sound/pci/hda/hda_codec.c

+5 −2
Original line number Diff line number Diff line
@@ -1733,11 +1733,14 @@ int snd_hda_ctl_add(struct hda_codec *codec, hda_nid_t nid, 
	unsigned short flags = 0;

	struct hda_nid_item *item;



	if (kctl->id.subdevice & HDA_SUBDEV_AMP_FLAG)

	if (kctl->id.subdevice & HDA_SUBDEV_AMP_FLAG) {

		flags |= HDA_NID_ITEM_AMP;

		if (nid == 0)

			nid = get_amp_nid_(kctl->private_value);

	}

	if ((kctl->id.subdevice & HDA_SUBDEV_NID_FLAG) != 0 && nid == 0)

		nid = kctl->id.subdevice & 0xffff;

	if (kctl->id.subdevice & 0xf0000000)

	if (kctl->id.subdevice & (HDA_SUBDEV_NID_FLAG|HDA_SUBDEV_AMP_FLAG))

		kctl->id.subdevice = 0;

	err = snd_ctl_add(codec->bus->card, kctl);

	if (err < 0)

sound/pci/hda/hda_local.h

+3 −3
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ 
/* mono volume with index (index=0,1,...) (channel=1,2) */

#define HDA_CODEC_VOLUME_MONO_IDX(xname, xcidx, nid, channel, xindex, direction) \

	{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xcidx,  \

	  .subdevice = HDA_SUBDEV_NID_FLAG | HDA_SUBDEV_AMP_FLAG | (nid), \

	  .subdevice = HDA_SUBDEV_AMP_FLAG, \

	  .access = SNDRV_CTL_ELEM_ACCESS_READWRITE | \

	  	    SNDRV_CTL_ELEM_ACCESS_TLV_READ | \

	  	    SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK, \
@@ -64,7 +64,7 @@ 
/* mono mute switch with index (index=0,1,...) (channel=1,2) */

#define HDA_CODEC_MUTE_MONO_IDX(xname, xcidx, nid, channel, xindex, direction) \

	{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xcidx, \

	  .subdevice = HDA_SUBDEV_NID_FLAG | HDA_SUBDEV_AMP_FLAG | (nid), \

	  .subdevice = HDA_SUBDEV_AMP_FLAG, \

	  .info = snd_hda_mixer_amp_switch_info, \

	  .get = snd_hda_mixer_amp_switch_get, \

	  .put = snd_hda_mixer_amp_switch_put, \
@@ -82,7 +82,7 @@ 
/* special beep mono mute switch with index (index=0,1,...) (channel=1,2) */

#define HDA_CODEC_MUTE_BEEP_MONO_IDX(xname, xcidx, nid, channel, xindex, direction) \

	{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xcidx, \

	  .subdevice = HDA_SUBDEV_NID_FLAG | HDA_SUBDEV_AMP_FLAG | (nid), \

	  .subdevice = HDA_SUBDEV_AMP_FLAG, \

	  .info = snd_hda_mixer_amp_switch_info, \

	  .get = snd_hda_mixer_amp_switch_get, \

	  .put = snd_hda_mixer_amp_switch_put_beep, \

sound/pci/hda/patch_analog.c

+6 −10
Original line number Diff line number Diff line
@@ -209,9 +209,7 @@ static int ad198x_build_controls(struct hda_codec *codec) 
			if (!kctl)

				return -ENOMEM;

			kctl->private_value = spec->beep_amp;

			err = snd_hda_ctl_add(codec,

						get_amp_nid_(spec->beep_amp),

						kctl);

			err = snd_hda_ctl_add(codec, 0, kctl);

			if (err < 0)

				return err;

		}
@@ -832,7 +830,7 @@ static struct snd_kcontrol_new ad1986a_automute_master_mixers[] = { 
	{

		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,

		.name = "Master Playback Switch",

		.subdevice = HDA_SUBDEV_NID_FLAG | HDA_SUBDEV_AMP_FLAG | 0x1a,

		.subdevice = HDA_SUBDEV_AMP_FLAG,

		.info = snd_hda_mixer_amp_switch_info,

		.get = snd_hda_mixer_amp_switch_get,

		.put = ad1986a_hp_master_sw_put,
@@ -2602,9 +2600,7 @@ static int add_control(struct ad198x_spec *spec, int type, const char *name, 
	if (! knew->name)

		return -ENOMEM;

	if (get_amp_nid_(val))

		knew->subdevice = HDA_SUBDEV_NID_FLAG |

				  HDA_SUBDEV_AMP_FLAG |

				  get_amp_nid_(val);

		knew->subdevice = HDA_SUBDEV_AMP_FLAG;

	knew->private_value = val;

	return 0;

}
@@ -3758,7 +3754,7 @@ static struct snd_kcontrol_new ad1884a_laptop_mixers[] = { 
	{

		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,

		.name = "Master Playback Switch",

		.subdevice = HDA_SUBDEV_NID_FLAG | HDA_SUBDEV_AMP_FLAG | 0x21,

		.subdevice = HDA_SUBDEV_AMP_FLAG,

		.info = snd_hda_mixer_amp_switch_info,

		.get = snd_hda_mixer_amp_switch_get,

		.put = ad1884a_mobile_master_sw_put,
@@ -3787,7 +3783,7 @@ static struct snd_kcontrol_new ad1884a_mobile_mixers[] = { 
	{

		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,

		.name = "Master Playback Switch",

		.subdevice = HDA_SUBDEV_NID_FLAG | HDA_SUBDEV_AMP_FLAG | 0x21,

		.subdevice = HDA_SUBDEV_AMP_FLAG,

		.info = snd_hda_mixer_amp_switch_info,

		.get = snd_hda_mixer_amp_switch_get,

		.put = ad1884a_mobile_master_sw_put,
@@ -4129,7 +4125,7 @@ static struct snd_kcontrol_new ad1984a_touchsmart_mixers[] = { 
/*	HDA_CODEC_MUTE("Master Playback Switch", 0x21, 0x0, HDA_OUTPUT),*/

	{

		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,

		.subdevice = HDA_SUBDEV_NID_FLAG | HDA_SUBDEV_AMP_FLAG | 0x21,

		.subdevice = HDA_SUBDEV_AMP_FLAG,

		.name = "Master Playback Switch",

		.info = snd_hda_mixer_amp_switch_info,

		.get = snd_hda_mixer_amp_switch_get,

sound/pci/hda/patch_cirrus.c

+2 −2
Original line number Diff line number Diff line
@@ -501,7 +501,7 @@ static int add_mute(struct hda_codec *codec, const char *name, int index, 
	snprintf(tmp, sizeof(tmp), "%s %s Switch", name, dir_sfx[dir]);

	*kctlp = snd_ctl_new1(&knew, codec);

	(*kctlp)->id.subdevice = HDA_SUBDEV_AMP_FLAG;

	return snd_hda_ctl_add(codec, get_amp_nid_(pval), *kctlp);

	return snd_hda_ctl_add(codec, 0, *kctlp);

}



static int add_volume(struct hda_codec *codec, const char *name,
@@ -515,7 +515,7 @@ static int add_volume(struct hda_codec *codec, const char *name, 
	snprintf(tmp, sizeof(tmp), "%s %s Volume", name, dir_sfx[dir]);

	*kctlp = snd_ctl_new1(&knew, codec);

	(*kctlp)->id.subdevice = HDA_SUBDEV_AMP_FLAG;

	return snd_hda_ctl_add(codec, get_amp_nid_(pval), *kctlp);

	return snd_hda_ctl_add(codec, 0, *kctlp);

}



static void fix_volume_caps(struct hda_codec *codec, hda_nid_t dac)

sound/pci/hda/patch_conexant.c

+1 −1
Original line number Diff line number Diff line
@@ -2178,7 +2178,7 @@ static struct snd_kcontrol_new cxt5066_mixer_master_olpc[] = { 
		.access = SNDRV_CTL_ELEM_ACCESS_READWRITE |

				  SNDRV_CTL_ELEM_ACCESS_TLV_READ |

				  SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK,

		.subdevice = HDA_SUBDEV_NID_FLAG | HDA_SUBDEV_AMP_FLAG | 0x10,

		.subdevice = HDA_SUBDEV_AMP_FLAG,

		.info = snd_hda_mixer_amp_volume_info,

		.get = snd_hda_mixer_amp_volume_get,

		.put = snd_hda_mixer_amp_volume_put,