From 2c7463d070c4e49ff850322d4f0321e97b0b6740 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Thu, 9 Jun 2022 14:02:16 +0200
Subject: [PATCH] ASoC: topology: Drop superfluous check of CONFIG_SND_CTL_VALIDATION
Git-commit: 2c7463d070c4e49ff850322d4f0321e97b0b6740
Patch-mainline: v6.0-rc1
References: jsc#PED-850
The compiler must be clever enough to optimize out for the no-op when
CONFIG_SND_CTL_VALIDATION is disabled. Let's drop the superfluous
check.
Link: https://lore.kernel.org/r/20220609120219.3937-2-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
sound/soc/soc-topology.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c
index 3f9d314fba16..b101db85446f 100644
--- a/sound/soc/soc-topology.c
+++ b/sound/soc/soc-topology.c
@@ -535,7 +535,7 @@ static int soc_tplg_kcontrol_bind_io(struct snd_soc_tplg_ctl_hdr *hdr,
* return an -EINVAL error and prevent the card from
* being configured.
*/
- if (IS_ENABLED(CONFIG_SND_CTL_VALIDATION) && sbe->max > 512)
+ if (sbe->max > 512)
k->access |= SNDRV_CTL_ELEM_ACCESS_SKIP_CHECK;
ext_ops = tplg->bytes_ext_ops;
--
2.35.3