From: "Amadeusz Sławiński" <amadeuszx.slawinski@linux.intel.com>
To: Mark Brown <broonie@kernel.org>
Cc: "Cezary Rojewski" <cezary.rojewski@intel.com>,
"Pierre-Louis Bossart" <pierre-louis.bossart@linux.intel.com>,
"Ranjani Sridharan" <ranjani.sridharan@linux.intel.com>,
"Takashi Iwai" <tiwai@suse.com>,
"Jaroslav Kysela" <perex@perex.cz>,
alsa-devel@alsa-project.org, linux-sound@vger.kernel.org,
"Jason Montleon" <jmontleo@redhat.com>,
"Amadeusz Sławiński" <amadeuszx.slawinski@linux.intel.com>
Subject: [PATCH 3/4] ASoC: topology: Do not assign fields that are already set
Date: Mon, 3 Jun 2024 12:28:17 +0200 [thread overview]
Message-ID: <20240603102818.36165-4-amadeuszx.slawinski@linux.intel.com> (raw)
In-Reply-To: <20240603102818.36165-1-amadeuszx.slawinski@linux.intel.com>
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>
---
sound/soc/soc-topology.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c
index 75d9395a18ed4..1db540aaad451 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),
--
2.34.1
next prev parent reply other threads:[~2024-06-03 10:27 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-03 10:28 [PATCH 0/4] ASoC: topology: Fix route memory corruption Amadeusz Sławiński
2024-06-03 10:28 ` [PATCH 1/4] ASoC: topology: Fix references to freed memory Amadeusz Sławiński
2024-06-13 5:58 ` Pierre-Louis Bossart
2024-06-13 6:27 ` Péter Ujfalusi
2024-06-13 6:29 ` Péter Ujfalusi
2024-06-13 6:44 ` Péter Ujfalusi
2024-06-13 7:31 ` Amadeusz Sławiński
2024-06-03 10:28 ` [PATCH 2/4] ASoC: Intel: avs: Fix route override Amadeusz Sławiński
2024-06-03 10:28 ` Amadeusz Sławiński [this message]
2024-06-03 10:28 ` [PATCH 4/4] ASoC: topology: Clean up route loading Amadeusz Sławiński
2024-06-11 16:12 ` [PATCH 0/4] ASoC: topology: Fix route memory corruption Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240603102818.36165-4-amadeuszx.slawinski@linux.intel.com \
--to=amadeuszx.slawinski@linux.intel.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=cezary.rojewski@intel.com \
--cc=jmontleo@redhat.com \
--cc=linux-sound@vger.kernel.org \
--cc=perex@perex.cz \
--cc=pierre-louis.bossart@linux.intel.com \
--cc=ranjani.sridharan@linux.intel.com \
--cc=tiwai@suse.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox