Skip to content

K
Kernel

openeuler / Kernel
大约 2 年 前同步成功

通知 8
Star 0
Fork 0
K
Kernel
未验证 提交 0db627c4 编写于 作者: A Amadeusz Sławiński 提交者： Mark Brown
浏览文件
操作

ASoC: topology: Remove unnecessary looping 

Functions creating kcontrols as written allow for creation of multiple
kcontrols at the same time, but in practice they are called for each
kcontrol individually. Remove unnecessary loop as code always loops once
anyway. This reduces intendation level allowing for some code to be put
on one line instead of multiple lines.
Signed-off-by: NAmadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
Reviewed-by: NRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: NCezary Rojewski <cezary.rojewski@intel.com>
Link: https://lore.kernel.org/r/20220401120200.4047867-3-amadeuszx.slawinski@linux.intel.comSigned-off-by: NMark Brown <broonie@kernel.org>
上级 395f8fd6
隐藏空白更改
内联 并排
Showing with 192 addition and 223 deletion
sound/soc/soc-topology.c
浏览文件 @ 0db627c4
...@@ -676,175 +676,156 @@ static int soc_tplg_create_tlv(struct soc_tplg *tplg, ...@@ -676,175 +676,156 @@ static int soc_tplg_create_tlv(struct soc_tplg *tplg,
return 0; return 0;
} }
static int soc_tplg_dbytes_create(struct soc_tplg *tplg, unsigned int count, static int soc_tplg_dbytes_create(struct soc_tplg *tplg, size_t size)
size_t size)
{ {
struct snd_soc_tplg_bytes_control *be; struct snd_soc_tplg_bytes_control *be;
struct soc_bytes_ext *sbe; struct soc_bytes_ext *sbe;
struct snd_kcontrol_new kc; struct snd_kcontrol_new kc;
int i; int ret = 0;
int err = 0;
if (soc_tplg_check_elem_count(tplg, if (soc_tplg_check_elem_count(tplg,
sizeof(struct snd_soc_tplg_bytes_control), sizeof(struct snd_soc_tplg_bytes_control),
count, size, "mixer bytes")) 1, size, "mixer bytes"))
return -EINVAL; return -EINVAL;
for (i = 0; i < count; i++) { be = (struct snd_soc_tplg_bytes_control *)tplg->pos;
be = (struct snd_soc_tplg_bytes_control *)tplg->pos;
/* validate kcontrol */ /* validate kcontrol */
if (strnlen(be->hdr.name, SNDRV_CTL_ELEM_ID_NAME_MAXLEN) == if (strnlen(be->hdr.name, SNDRV_CTL_ELEM_ID_NAME_MAXLEN) ==
SNDRV_CTL_ELEM_ID_NAME_MAXLEN) SNDRV_CTL_ELEM_ID_NAME_MAXLEN)
return -EINVAL; return -EINVAL;
sbe = devm_kzalloc(tplg->dev, sizeof(*sbe), GFP_KERNEL); sbe = devm_kzalloc(tplg->dev, sizeof(*sbe), GFP_KERNEL);
if (sbe == NULL) if (sbe == NULL)
return -ENOMEM; return -ENOMEM;
tplg->pos += (sizeof(struct snd_soc_tplg_bytes_control) + tplg->pos += (sizeof(struct snd_soc_tplg_bytes_control) +
le32_to_cpu(be->priv.size)); le32_to_cpu(be->priv.size));
dev_dbg(tplg->dev, dev_dbg(tplg->dev,
"ASoC: adding bytes kcontrol %s with access 0x%x\n", "ASoC: adding bytes kcontrol %s with access 0x%x\n",
be->hdr.name, be->hdr.access); be->hdr.name, be->hdr.access);
memset(&kc, 0, sizeof(kc));
kc.name = be->hdr.name;
kc.private_value = (long)sbe;
kc.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
kc.access = le32_to_cpu(be->hdr.access);
sbe->max = le32_to_cpu(be->max);
sbe->dobj.type = SND_SOC_DOBJ_BYTES;
sbe->dobj.ops = tplg->ops;
INIT_LIST_HEAD(&sbe->dobj.list);
/* map io handlers */
err = soc_tplg_kcontrol_bind_io(&be->hdr, &kc, tplg);
if (err) {
soc_control_err(tplg, &be->hdr, be->hdr.name);
break;
}
/* pass control to driver for optional further init */ memset(&kc, 0, sizeof(kc));
err = soc_tplg_init_kcontrol(tplg, &kc, kc.name = be->hdr.name;
(struct snd_soc_tplg_ctl_hdr *)be); kc.private_value = (long)sbe;
if (err < 0) { kc.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
dev_err(tplg->dev, "ASoC: failed to init %s\n", kc.access = le32_to_cpu(be->hdr.access);
be->hdr.name);
break;
}
/* register control here */ sbe->max = le32_to_cpu(be->max);
err = soc_tplg_add_kcontrol(tplg, &kc, sbe->dobj.type = SND_SOC_DOBJ_BYTES;
&sbe->dobj.control.kcontrol); sbe->dobj.ops = tplg->ops;
if (err < 0) { INIT_LIST_HEAD(&sbe->dobj.list);
dev_err(tplg->dev, "ASoC: failed to add %s\n",
be->hdr.name);
break;
}
list_add(&sbe->dobj.list, &tplg->comp->dobj_list); /* map io handlers */
ret = soc_tplg_kcontrol_bind_io(&be->hdr, &kc, tplg);
if (ret) {
soc_control_err(tplg, &be->hdr, be->hdr.name);
goto err;
} }
return err;
/* pass control to driver for optional further init */
ret = soc_tplg_init_kcontrol(tplg, &kc, (struct snd_soc_tplg_ctl_hdr *)be);
if (ret < 0) {
dev_err(tplg->dev, "ASoC: failed to init %s\n", be->hdr.name);
goto err;
}
/* register control here */
ret = soc_tplg_add_kcontrol(tplg, &kc, &sbe->dobj.control.kcontrol);
if (ret < 0) {
dev_err(tplg->dev, "ASoC: failed to add %s\n", be->hdr.name);
goto err;
}
list_add(&sbe->dobj.list, &tplg->comp->dobj_list);
err:
return ret;
} }
static int soc_tplg_dmixer_create(struct soc_tplg *tplg, unsigned int count, static int soc_tplg_dmixer_create(struct soc_tplg *tplg, size_t size)
size_t size)
{ {
struct snd_soc_tplg_mixer_control *mc; struct snd_soc_tplg_mixer_control *mc;
struct soc_mixer_control *sm; struct soc_mixer_control *sm;
struct snd_kcontrol_new kc; struct snd_kcontrol_new kc;
int i; int ret = 0;
int err = 0;
if (soc_tplg_check_elem_count(tplg, if (soc_tplg_check_elem_count(tplg,
sizeof(struct snd_soc_tplg_mixer_control), sizeof(struct snd_soc_tplg_mixer_control),
count, size, "mixers")) 1, size, "mixers"))
return -EINVAL; return -EINVAL;
for (i = 0; i < count; i++) { mc = (struct snd_soc_tplg_mixer_control *)tplg->pos;
mc = (struct snd_soc_tplg_mixer_control *)tplg->pos;
/* validate kcontrol */ /* validate kcontrol */
if (strnlen(mc->hdr.name, SNDRV_CTL_ELEM_ID_NAME_MAXLEN) == if (strnlen(mc->hdr.name, SNDRV_CTL_ELEM_ID_NAME_MAXLEN) ==
SNDRV_CTL_ELEM_ID_NAME_MAXLEN) SNDRV_CTL_ELEM_ID_NAME_MAXLEN)
return -EINVAL; return -EINVAL;
sm = devm_kzalloc(tplg->dev, sizeof(*sm), GFP_KERNEL); sm = devm_kzalloc(tplg->dev, sizeof(*sm), GFP_KERNEL);
if (sm == NULL) if (sm == NULL)
return -ENOMEM; return -ENOMEM;
tplg->pos += (sizeof(struct snd_soc_tplg_mixer_control) + tplg->pos += (sizeof(struct snd_soc_tplg_mixer_control) +
le32_to_cpu(mc->priv.size)); le32_to_cpu(mc->priv.size));
dev_dbg(tplg->dev, dev_dbg(tplg->dev,
"ASoC: adding mixer kcontrol %s with access 0x%x\n", "ASoC: adding mixer kcontrol %s with access 0x%x\n",
mc->hdr.name, mc->hdr.access); mc->hdr.name, mc->hdr.access);
memset(&kc, 0, sizeof(kc));
kc.name = mc->hdr.name;
kc.private_value = (long)sm;
kc.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
kc.access = le32_to_cpu(mc->hdr.access);
/* we only support FL/FR channel mapping atm */
sm->reg = tplc_chan_get_reg(tplg, mc->channel,
SNDRV_CHMAP_FL);
sm->rreg = tplc_chan_get_reg(tplg, mc->channel,
SNDRV_CHMAP_FR);
sm->shift = tplc_chan_get_shift(tplg, mc->channel,
SNDRV_CHMAP_FL);
sm->rshift = tplc_chan_get_shift(tplg, mc->channel,
SNDRV_CHMAP_FR);
sm->max = le32_to_cpu(mc->max);
sm->min = le32_to_cpu(mc->min);
sm->invert = le32_to_cpu(mc->invert);
sm->platform_max = le32_to_cpu(mc->platform_max);
sm->dobj.index = tplg->index;
sm->dobj.ops = tplg->ops;
sm->dobj.type = SND_SOC_DOBJ_MIXER;
INIT_LIST_HEAD(&sm->dobj.list);
/* map io handlers */
err = soc_tplg_kcontrol_bind_io(&mc->hdr, &kc, tplg);
if (err) {
soc_control_err(tplg, &mc->hdr, mc->hdr.name);
break;
}
/* create any TLV data */ memset(&kc, 0, sizeof(kc));
err = soc_tplg_create_tlv(tplg, &kc, &mc->hdr); kc.name = mc->hdr.name;
if (err < 0) { kc.private_value = (long)sm;
dev_err(tplg->dev, "ASoC: failed to create TLV %s\n", kc.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
mc->hdr.name); kc.access = le32_to_cpu(mc->hdr.access);
break;
}
/* pass control to driver for optional further init */ /* we only support FL/FR channel mapping atm */
err = soc_tplg_init_kcontrol(tplg, &kc, sm->reg = tplc_chan_get_reg(tplg, mc->channel, SNDRV_CHMAP_FL);
(struct snd_soc_tplg_ctl_hdr *) mc); sm->rreg = tplc_chan_get_reg(tplg, mc->channel, SNDRV_CHMAP_FR);
if (err < 0) { sm->shift = tplc_chan_get_shift(tplg, mc->channel, SNDRV_CHMAP_FL);
dev_err(tplg->dev, "ASoC: failed to init %s\n", sm->rshift = tplc_chan_get_shift(tplg, mc->channel, SNDRV_CHMAP_FR);
mc->hdr.name);
break;
}
/* register control here */ sm->max = le32_to_cpu(mc->max);
err = soc_tplg_add_kcontrol(tplg, &kc, sm->min = le32_to_cpu(mc->min);
&sm->dobj.control.kcontrol); sm->invert = le32_to_cpu(mc->invert);
if (err < 0) { sm->platform_max = le32_to_cpu(mc->platform_max);
dev_err(tplg->dev, "ASoC: failed to add %s\n", sm->dobj.index = tplg->index;
mc->hdr.name); sm->dobj.ops = tplg->ops;
break; sm->dobj.type = SND_SOC_DOBJ_MIXER;
} INIT_LIST_HEAD(&sm->dobj.list);
/* map io handlers */
ret = soc_tplg_kcontrol_bind_io(&mc->hdr, &kc, tplg);
if (ret) {
soc_control_err(tplg, &mc->hdr, mc->hdr.name);
goto err;
}
list_add(&sm->dobj.list, &tplg->comp->dobj_list); /* create any TLV data */
ret = soc_tplg_create_tlv(tplg, &kc, &mc->hdr);
if (ret < 0) {
dev_err(tplg->dev, "ASoC: failed to create TLV %s\n", mc->hdr.name);
goto err;
} }
return err; /* pass control to driver for optional further init */
ret = soc_tplg_init_kcontrol(tplg, &kc, (struct snd_soc_tplg_ctl_hdr *)mc);
if (ret < 0) {
dev_err(tplg->dev, "ASoC: failed to init %s\n", mc->hdr.name);
goto err;
}
/* register control here */
ret = soc_tplg_add_kcontrol(tplg, &kc, &sm->dobj.control.kcontrol);
if (ret < 0) {
dev_err(tplg->dev, "ASoC: failed to add %s\n", mc->hdr.name);
goto err;
}
list_add(&sm->dobj.list, &tplg->comp->dobj_list);
err:
return ret;
} }
static int soc_tplg_denum_create_texts(struct soc_tplg *tplg, struct soc_enum *se, static int soc_tplg_denum_create_texts(struct soc_tplg *tplg, struct soc_enum *se,
...@@ -911,117 +892,108 @@ static int soc_tplg_denum_create_values(struct soc_tplg *tplg, struct soc_enum * ...@@ -911,117 +892,108 @@ static int soc_tplg_denum_create_values(struct soc_tplg *tplg, struct soc_enum *
return 0; return 0;
} }
static int soc_tplg_denum_create(struct soc_tplg *tplg, unsigned int count, static int soc_tplg_denum_create(struct soc_tplg *tplg, size_t size)
size_t size)
{ {
struct snd_soc_tplg_enum_control *ec; struct snd_soc_tplg_enum_control *ec;
struct soc_enum *se; struct soc_enum *se;
struct snd_kcontrol_new kc; struct snd_kcontrol_new kc;
int i; int ret = 0;
int err = 0;
if (soc_tplg_check_elem_count(tplg, if (soc_tplg_check_elem_count(tplg,
sizeof(struct snd_soc_tplg_enum_control), sizeof(struct snd_soc_tplg_enum_control),
count, size, "enums")) 1, size, "enums"))
return -EINVAL; return -EINVAL;
for (i = 0; i < count; i++) { ec = (struct snd_soc_tplg_enum_control *)tplg->pos;
ec = (struct snd_soc_tplg_enum_control *)tplg->pos;
/* validate kcontrol */ /* validate kcontrol */
if (strnlen(ec->hdr.name, SNDRV_CTL_ELEM_ID_NAME_MAXLEN) == if (strnlen(ec->hdr.name, SNDRV_CTL_ELEM_ID_NAME_MAXLEN) ==
SNDRV_CTL_ELEM_ID_NAME_MAXLEN) SNDRV_CTL_ELEM_ID_NAME_MAXLEN)
return -EINVAL; return -EINVAL;
se = devm_kzalloc(tplg->dev, (sizeof(*se)), GFP_KERNEL); se = devm_kzalloc(tplg->dev, (sizeof(*se)), GFP_KERNEL);
if (se == NULL) if (se == NULL)
return -ENOMEM; return -ENOMEM;
tplg->pos += (sizeof(struct snd_soc_tplg_enum_control) + tplg->pos += (sizeof(struct snd_soc_tplg_enum_control) +
le32_to_cpu(ec->priv.size)); le32_to_cpu(ec->priv.size));
dev_dbg(tplg->dev, "ASoC: adding enum kcontrol %s size %d\n", dev_dbg(tplg->dev, "ASoC: adding enum kcontrol %s size %d\n",
ec->hdr.name, ec->items); ec->hdr.name, ec->items);
memset(&kc, 0, sizeof(kc)); memset(&kc, 0, sizeof(kc));
kc.name = ec->hdr.name; kc.name = ec->hdr.name;
kc.private_value = (long)se; kc.private_value = (long)se;
kc.iface = SNDRV_CTL_ELEM_IFACE_MIXER; kc.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
kc.access = le32_to_cpu(ec->hdr.access); kc.access = le32_to_cpu(ec->hdr.access);
se->reg = tplc_chan_get_reg(tplg, ec->channel, SNDRV_CHMAP_FL); se->reg = tplc_chan_get_reg(tplg, ec->channel, SNDRV_CHMAP_FL);
se->shift_l = tplc_chan_get_shift(tplg, ec->channel, se->shift_l = tplc_chan_get_shift(tplg, ec->channel,
SNDRV_CHMAP_FL); SNDRV_CHMAP_FL);
se->shift_r = tplc_chan_get_shift(tplg, ec->channel, se->shift_r = tplc_chan_get_shift(tplg, ec->channel,
SNDRV_CHMAP_FL); SNDRV_CHMAP_FL);
se->mask = le32_to_cpu(ec->mask); se->mask = le32_to_cpu(ec->mask);
se->dobj.index = tplg->index; se->dobj.index = tplg->index;
se->dobj.type = SND_SOC_DOBJ_ENUM; se->dobj.type = SND_SOC_DOBJ_ENUM;
se->dobj.ops = tplg->ops; se->dobj.ops = tplg->ops;
INIT_LIST_HEAD(&se->dobj.list); INIT_LIST_HEAD(&se->dobj.list);
switch (le32_to_cpu(ec->hdr.ops.info)) { switch (le32_to_cpu(ec->hdr.ops.info)) {
case SND_SOC_TPLG_DAPM_CTL_ENUM_VALUE: case SND_SOC_TPLG_DAPM_CTL_ENUM_VALUE:
case SND_SOC_TPLG_CTL_ENUM_VALUE: case SND_SOC_TPLG_CTL_ENUM_VALUE:
err = soc_tplg_denum_create_values(tplg, se, ec); ret = soc_tplg_denum_create_values(tplg, se, ec);
if (err < 0) { if (ret < 0) {
dev_err(tplg->dev,
"ASoC: could not create values for %s\n",
ec->hdr.name);
goto err_denum;
}
fallthrough;
case SND_SOC_TPLG_CTL_ENUM:
case SND_SOC_TPLG_DAPM_CTL_ENUM_DOUBLE:
case SND_SOC_TPLG_DAPM_CTL_ENUM_VIRT:
err = soc_tplg_denum_create_texts(tplg, se, ec);
if (err < 0) {
dev_err(tplg->dev,
"ASoC: could not create texts for %s\n",
ec->hdr.name);
goto err_denum;
}
break;
default:
err = -EINVAL;
dev_err(tplg->dev, dev_err(tplg->dev,
"ASoC: invalid enum control type %d for %s\n", "ASoC: could not create values for %s\n",
ec->hdr.ops.info, ec->hdr.name);
goto err_denum;
}
/* map io handlers */
err = soc_tplg_kcontrol_bind_io(&ec->hdr, &kc, tplg);
if (err) {
soc_control_err(tplg, &ec->hdr, ec->hdr.name);
goto err_denum;
}
/* pass control to driver for optional further init */
err = soc_tplg_init_kcontrol(tplg, &kc,
(struct snd_soc_tplg_ctl_hdr *) ec);
if (err < 0) {
dev_err(tplg->dev, "ASoC: failed to init %s\n",
ec->hdr.name); ec->hdr.name);
goto err_denum; goto err;
} }
fallthrough;
/* register control here */ case SND_SOC_TPLG_CTL_ENUM:
err = soc_tplg_add_kcontrol(tplg, case SND_SOC_TPLG_DAPM_CTL_ENUM_DOUBLE:
&kc, &se->dobj.control.kcontrol); case SND_SOC_TPLG_DAPM_CTL_ENUM_VIRT:
if (err < 0) { ret = soc_tplg_denum_create_texts(tplg, se, ec);
dev_err(tplg->dev, "ASoC: could not add kcontrol %s\n", if (ret < 0) {
dev_err(tplg->dev,
"ASoC: could not create texts for %s\n",
ec->hdr.name); ec->hdr.name);
goto err_denum; goto err;
} }
break;
default:
ret = -EINVAL;
dev_err(tplg->dev,
"ASoC: invalid enum control type %d for %s\n",
ec->hdr.ops.info, ec->hdr.name);
goto err;
}
list_add(&se->dobj.list, &tplg->comp->dobj_list); /* map io handlers */
ret = soc_tplg_kcontrol_bind_io(&ec->hdr, &kc, tplg);
if (ret) {
soc_control_err(tplg, &ec->hdr, ec->hdr.name);
goto err;
} }
return 0;
err_denum: /* pass control to driver for optional further init */
return err; ret = soc_tplg_init_kcontrol(tplg, &kc, (struct snd_soc_tplg_ctl_hdr *)ec);
if (ret < 0) {
dev_err(tplg->dev, "ASoC: failed to init %s\n", ec->hdr.name);
goto err;
}
/* register control here */
ret = soc_tplg_add_kcontrol(tplg, &kc, &se->dobj.control.kcontrol);
if (ret < 0) {
dev_err(tplg->dev, "ASoC: could not add kcontrol %s\n", ec->hdr.name);
goto err;
}
list_add(&se->dobj.list, &tplg->comp->dobj_list);
err:
return ret;
} }
static int soc_tplg_kcontrol_elems_load(struct soc_tplg *tplg, static int soc_tplg_kcontrol_elems_load(struct soc_tplg *tplg,
...@@ -1049,20 +1021,17 @@ static int soc_tplg_kcontrol_elems_load(struct soc_tplg *tplg, ...@@ -1049,20 +1021,17 @@ static int soc_tplg_kcontrol_elems_load(struct soc_tplg *tplg,
case SND_SOC_TPLG_CTL_RANGE: case SND_SOC_TPLG_CTL_RANGE:
case SND_SOC_TPLG_DAPM_CTL_VOLSW: case SND_SOC_TPLG_DAPM_CTL_VOLSW:
case SND_SOC_TPLG_DAPM_CTL_PIN: case SND_SOC_TPLG_DAPM_CTL_PIN:
ret = soc_tplg_dmixer_create(tplg, 1, ret = soc_tplg_dmixer_create(tplg, le32_to_cpu(hdr->payload_size));
le32_to_cpu(hdr->payload_size));
break; break;
case SND_SOC_TPLG_CTL_ENUM: case SND_SOC_TPLG_CTL_ENUM:
case SND_SOC_TPLG_CTL_ENUM_VALUE: case SND_SOC_TPLG_CTL_ENUM_VALUE:
case SND_SOC_TPLG_DAPM_CTL_ENUM_DOUBLE: case SND_SOC_TPLG_DAPM_CTL_ENUM_DOUBLE:
case SND_SOC_TPLG_DAPM_CTL_ENUM_VIRT: case SND_SOC_TPLG_DAPM_CTL_ENUM_VIRT:
case SND_SOC_TPLG_DAPM_CTL_ENUM_VALUE: case SND_SOC_TPLG_DAPM_CTL_ENUM_VALUE:
ret = soc_tplg_denum_create(tplg, 1, ret = soc_tplg_denum_create(tplg, le32_to_cpu(hdr->payload_size));
le32_to_cpu(hdr->payload_size));
break; break;
case SND_SOC_TPLG_CTL_BYTES: case SND_SOC_TPLG_CTL_BYTES:
ret = soc_tplg_dbytes_create(tplg, 1, ret = soc_tplg_dbytes_create(tplg, le32_to_cpu(hdr->payload_size));
le32_to_cpu(hdr->payload_size));
break; break;
default: default:
soc_bind_err(tplg, control_hdr, i); soc_bind_err(tplg, control_hdr, i);
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或