summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorAmadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>2024-06-03 12:28:17 +0200
committerMark Brown <broonie@kernel.org>2024-06-10 13:47:19 +0200
commitdaf0b99d4720c9f05bdb81c73b2efdb43fa9def3 (patch)
tree8b80d85e6c6822be8cf3413a0767d96e5d0e21fd /sound
parentASoC: Intel: avs: Fix route override (diff)
downloadlinux-daf0b99d4720c9f05bdb81c73b2efdb43fa9def3.tar.xz
linux-daf0b99d4720c9f05bdb81c73b2efdb43fa9def3.zip
ASoC: topology: Do not assign fields that are already set
The routes are allocated with kzalloc(), so all fields are zeroed by default, skip unnecessary assignments. Reviewed-by: Cezary Rojewski <cezary.rojewski@intel.com> Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com> Link: https://lore.kernel.org/r/20240603102818.36165-4-amadeuszx.slawinski@linux.intel.com Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/soc-topology.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c
index 75d9395a18ed..1db540aaad45 100644
--- a/sound/soc/soc-topology.c
+++ b/sound/soc/soc-topology.c
@@ -1072,11 +1072,7 @@ static int soc_tplg_dapm_graph_elems_load(struct soc_tplg *tplg,
break;
}
- /* set to NULL atm for tplg users */
- route->connected = NULL;
- if (strnlen(elem->control, SNDRV_CTL_ELEM_ID_NAME_MAXLEN) == 0) {
- route->control = NULL;
- } else {
+ if (strnlen(elem->control, SNDRV_CTL_ELEM_ID_NAME_MAXLEN) != 0) {
route->control = devm_kmemdup(tplg->dev, elem->control,
min(strlen(elem->control),
SNDRV_CTL_ELEM_ID_NAME_MAXLEN),