From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 805EB1A00C4; Tue, 9 Jul 2024 16:20:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720542031; cv=none; b=decvOH1rYOUO1Cgc61sCipmBlTMB+X4Y3xfghoY2QuALZinoaTJqlV1D04UuJY8dtHgYsmI0RKBFbVVrVPH8sgy35Jp9+GGG1SKWRSKZ/HCXvfxnNgR0C8vcqzI/xbhhSUdprnxNfwpZiYg2uy4LoxN72qvM9YvCwTYT/G9DTx4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720542031; c=relaxed/simple; bh=DHbxU+CL7smIC+dUhfms0cAHtrlwCb3mxOhP1jzYmB8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=cJASl9Pk7Dxn7j3dV2y2T/PHNAhk5KBXzIrMt85EK2PCFZC7prra9hSCcTsD0Tqrew2iJ28iD9gJxHib6VnaKwB7mTHrLAonYkIkwBC+HJG61AzwXK2OfPcmXccD2gExEQvU27l2eOcDTizz7O+capJPkmHm40E2aYAf62qQ/zw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Zy+lr04D; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Zy+lr04D" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7FF51C3277B; Tue, 9 Jul 2024 16:20:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1720542031; bh=DHbxU+CL7smIC+dUhfms0cAHtrlwCb3mxOhP1jzYmB8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Zy+lr04D1XsJSGm7lXZyAnmFis+TRrd/FXfUr3UydwFcvZLjZYLVoCDQM1ymExl83 sPSI2D8JfuVKA2/P7ZkcMEP0GvBoF9uJv0voXuMr9bhUlK4YA+9WZqRYiRnAzTYCVV d61iZAgsCR/4N1RnurkJA3Op/7WMdX9UGQJGSgqJPBRr9RBuSaiLIYrWiXa6Mt33tw ZgccChsITRQz4yJ6iGSRjAXWQFzpca7KG67J4G55YuL/0iXxIZeKG1JbCpJjkv8h/X iN/v59OtAfBKfTEo8r5zi2Q+QuvSc4pF+KhGehNjNRwd0IW8djMPhRDKFrs9z5/TsQ 43tft8Lz/ipZg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: =?UTF-8?q?Amadeusz=20S=C5=82awi=C5=84ski?= , Cezary Rojewski , Mark Brown , Sasha Levin , lgirdwood@gmail.com, perex@perex.cz, tiwai@suse.com, linux-sound@vger.kernel.org Subject: [PATCH AUTOSEL 6.9 09/40] ASoC: topology: Do not assign fields that are already set Date: Tue, 9 Jul 2024 12:18:49 -0400 Message-ID: <20240709162007.30160-9-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240709162007.30160-1-sashal@kernel.org> References: <20240709162007.30160-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.9.8 Content-Transfer-Encoding: 8bit From: Amadeusz Sławiński [ Upstream commit daf0b99d4720c9f05bdb81c73b2efdb43fa9def3 ] The routes are allocated with kzalloc(), so all fields are zeroed by default, skip unnecessary assignments. Reviewed-by: Cezary Rojewski Signed-off-by: Amadeusz Sławiński Link: https://lore.kernel.org/r/20240603102818.36165-4-amadeuszx.slawinski@linux.intel.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- 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 7add1dbf1d214..ce22613bf9690 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.43.0