diff options
| author | Ingo Molnar <mingo@kernel.org> | 2024-04-06 13:00:32 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2024-04-06 13:00:32 +0200 |
| commit | 5f2ca44ed235c86a0d6b9bfb599d1664ea94b4b9 (patch) | |
| tree | 0475ba937cecc36b1e38afcd0f3babba23092aba /sound/soc/sof/ipc4-priv.h | |
| parent | x86/mce: Make sure to grab mce_sysfs_mutex in set_bank() (diff) | |
| parent | Merge tag 'firewire-fixes-6.9-rc2' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
| download | linux-5f2ca44ed235c86a0d6b9bfb599d1664ea94b4b9.tar.xz linux-5f2ca44ed235c86a0d6b9bfb599d1664ea94b4b9.zip | |
Merge branch 'linus' into x86/urgent, to pick up dependent commit
We want to fix:
0e110732473e ("x86/retpoline: Do the necessary fixup to the Zen3/4 srso return thunk for !SRSO")
So merge in Linus's latest into x86/urgent to have it available.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'sound/soc/sof/ipc4-priv.h')
| -rw-r--r-- | sound/soc/sof/ipc4-priv.h | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/sound/soc/sof/ipc4-priv.h b/sound/soc/sof/ipc4-priv.h index f3b908b093f9..afed618a15f0 100644 --- a/sound/soc/sof/ipc4-priv.h +++ b/sound/soc/sof/ipc4-priv.h @@ -92,20 +92,6 @@ struct sof_ipc4_fw_data { struct mutex pipeline_state_mutex; /* protect pipeline triggers, ref counts and states */ }; -/** - * struct sof_ipc4_timestamp_info - IPC4 timestamp info - * @host_copier: the host copier of the pcm stream - * @dai_copier: the dai copier of the pcm stream - * @stream_start_offset: reported by fw in memory window - * @llp_offset: llp offset in memory window - */ -struct sof_ipc4_timestamp_info { - struct sof_ipc4_copier *host_copier; - struct sof_ipc4_copier *dai_copier; - u64 stream_start_offset; - u32 llp_offset; -}; - extern const struct sof_ipc_fw_loader_ops ipc4_loader_ops; extern const struct sof_ipc_tplg_ops ipc4_tplg_ops; extern const struct sof_ipc_tplg_control_ops tplg_ipc4_control_ops; |