diff options
| author | Takashi Iwai <tiwai@suse.de> | 2025-01-20 11:25:33 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2025-01-20 11:25:33 +0300 |
| commit | 7bba999e939f6d20e4db66effeecc179ed896496 (patch) | |
| tree | 2d044d6a466a798b0c779e2fc9e66520b4aae940 /include | |
| parent | 8cd671d65b4255bb7ce368b4258ef4fd52798468 (diff) | |
| parent | 1a0f59b04c8c9e1177731609e62e2a439cfa3a73 (diff) | |
| download | linux-7bba999e939f6d20e4db66effeecc179ed896496.tar.xz | |
Merge branch 'for-linus' into for-next
Pull pending ASoC and HD-audio fixes for 6.14-rc1
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'include')
| -rw-r--r-- | include/sound/simple_card_utils.h | 7 |
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) && \ |