Unverified Commit ccb367c5 authored by Shenghao Ding's avatar Shenghao Ding Committed by Mark Brown
Browse files

ASoc: pcm6240: Remove unnecessary name-prefix for all the controls 



Adding name-prefix for each audio controls is a redundant, because
name-prefix will be automatically added behind the control name when
creating a new control.

Signed-off-by: default avatarShenghao Ding <shenghao-ding@ti.com>
Link: https://patch.msgid.link/20240705064846.1723-1-shenghao-ding@ti.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent fc800b84

sound/soc/codecs/pcm6240.c

+6 −24
Original line number Diff line number Diff line
@@ -58,12 +58,6 @@ static const char *const pcmdev_ctrl_name[] = { 
	"%s i2c%d Dev%d Ch%d Fine Volume",

};



static const char *const pcmdev_ctrl_name_with_prefix[] = {

	"%s Dev%d Ch%d Ana Volume",

	"%s Dev%d Ch%d Digi Volume",

	"%s Dev%d Ch%d Fine Volume",

};



static const struct pcmdevice_mixer_control adc5120_analog_gain_ctl[] = {

	{

		.shift = 1,
@@ -1366,9 +1360,6 @@ static int pcmdev_gain_ctrl_add(struct pcmdevice_priv *pcm_dev, 


	name_id = pcmdev_gain_ctl_info[id][ctl_id].pcmdev_ctrl_name_id;



	if (comp->name_prefix)

		ctrl_name = pcmdev_ctrl_name_with_prefix[name_id];

	else

	ctrl_name = pcmdev_ctrl_name[name_id];



	for (chn = 1; chn <= nr_chn; chn++) {
@@ -1378,10 +1369,6 @@ static int pcmdev_gain_ctrl_add(struct pcmdevice_priv *pcm_dev, 
			ret = -ENOMEM;

			goto out;

		}

		if (comp->name_prefix)

			scnprintf(name, SNDRV_CTL_ELEM_ID_NAME_MAXLEN,

				ctrl_name, comp->name_prefix, dev_no, chn);

		else

		scnprintf(name, SNDRV_CTL_ELEM_ID_NAME_MAXLEN,

			ctrl_name, pcm_dev->upper_dev_name, adap->nr,

			dev_no, chn);
@@ -1438,13 +1425,8 @@ static int pcmdev_profile_ctrl_add(struct pcmdevice_priv *pcm_dev) 
	if (!name)

		return -ENOMEM;



	if (comp->name_prefix)

		scnprintf(name, SNDRV_CTL_ELEM_ID_NAME_MAXLEN,

			"%s Profile id", comp->name_prefix);

	else

	scnprintf(name, SNDRV_CTL_ELEM_ID_NAME_MAXLEN,

			"%s i2c%d Profile id", pcm_dev->upper_dev_name,

			adap->nr);

		"%s i2c%d Profile id", pcm_dev->upper_dev_name, adap->nr);

	pcmdev_ctrl->name = name;

	pcmdev_ctrl->iface = SNDRV_CTL_ELEM_IFACE_MIXER;

	pcmdev_ctrl->info = pcmdevice_info_profile;