summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2025-01-18 11:14:40 +0300
committerTakashi Iwai <tiwai@suse.de>2025-01-18 11:14:40 +0300
commit1a0f59b04c8c9e1177731609e62e2a439cfa3a73 (patch)
tree85614cf8ea293302a3619293026bd4a0258ff08a /include
parent5cb4e5b056772e341b590755a976081776422053 (diff)
parent75a7f7d6e7e10b9052d287be37f965103e1abae1 (diff)
downloadlinux-1a0f59b04c8c9e1177731609e62e2a439cfa3a73.tar.xz
Merge tag 'asoc-fix-v6.13-rc7' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v6.13 A few final driver specific fixes - a couple of x86 ID field changes, plus bug fixes for simple-card-utils and nau8824.
Diffstat (limited to 'include')
-rw-r--r--include/sound/simple_card_utils.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/include/sound/simple_card_utils.h b/include/sound/simple_card_utils.h
index 3360d9eab068..36a485571142 100644
--- a/include/sound/simple_card_utils.h
+++ b/include/sound/simple_card_utils.h
@@ -89,6 +89,13 @@ struct simple_util_priv {
#define simple_props_to_dai_codec(props, i) ((props)->codec_dai + i)
#define simple_props_to_codec_conf(props, i) ((props)->codec_conf + i)
+/* has the same effect as simple_priv_to_props(). Preferred over
+ * simple_priv_to_props() when dealing with PCM runtime data as
+ * the ID stored in rtd->id may not be a valid array index.
+ */
+#define runtime_simple_priv_to_props(priv, rtd) \
+ ((priv)->dai_props + ((rtd)->dai_link - (priv)->dai_link))
+
#define for_each_prop_dlc_cpus(props, i, cpu) \
for ((i) = 0; \
((i) < (props)->num.cpus) && \