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

Commit 841bdb7c authored by Takashi Sakamoto's avatar Takashi Sakamoto Committed by Takashi Iwai
Browse files

ALSA: vmaster: use position offset macro of TLV data 



A series of SNDRV_CTL_TLVO_XXX macro was introduced for position offset
of TLV data. This commit applies a code optimization.

Signed-off-by: default avatarTakashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent e6f32bf4

sound/core/vmaster.c

+9 −7
Original line number Diff line number Diff line
@@ -421,14 +421,16 @@ struct snd_kcontrol *snd_ctl_make_virtual_master(char *name, 
	kctl->private_free = master_free;



	/* additional (constant) TLV read */

	if (tlv &&

	    (tlv[0] == SNDRV_CTL_TLVT_DB_SCALE ||

	     tlv[0] == SNDRV_CTL_TLVT_DB_MINMAX ||

	     tlv[0] == SNDRV_CTL_TLVT_DB_MINMAX_MUTE)) {

	if (tlv) {

		unsigned int type = tlv[SNDRV_CTL_TLVO_TYPE];

		if (type == SNDRV_CTL_TLVT_DB_SCALE ||

		    type == SNDRV_CTL_TLVT_DB_MINMAX ||

		    type == SNDRV_CTL_TLVT_DB_MINMAX_MUTE) {

			kctl->vd[0].access |= SNDRV_CTL_ELEM_ACCESS_TLV_READ;

			memcpy(master->tlv, tlv, sizeof(master->tlv));

			kctl->tlv.p = master->tlv;

		}

	}



	return kctl;

}