]> git.hungrycats.org Git - linux/commitdiff
ASoC: topology: Do not assign fields that are already set
authorAmadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
Mon, 3 Jun 2024 10:28:17 +0000 (12:28 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 25 Jul 2024 07:53:32 +0000 (09:53 +0200)
[ Upstream commit daf0b99d4720c9f05bdb81c73b2efdb43fa9def3 ]

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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
sound/soc/soc-topology.c

index 7add1dbf1d214a18550df70c4d0d2147c735f44f..ce22613bf9690da54a30840b7772cc45e41f8cc8 100644 (file)
@@ -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),