Skip to content

Commit 31d2874

Browse files
ujfalusibroonie
authored andcommitted
ASoC: SOF: ipc4-pcm: Move struct sof_ipc4_timestamp_info definition locally
The sof_ipc4_timestamp_info is only used by ipc4-pcm.c internally, it should not be in a generic header implying that it might be used elsewhere. Cc: [email protected] # 6.8 Signed-off-by: Peter Ujfalusi <[email protected]> Reviewed-by: Kai Vehmanen <[email protected]> Reviewed-by: Pierre-Louis Bossart <[email protected]> Link: https://msgid.link/r/[email protected] Signed-off-by: Mark Brown <[email protected]>
1 parent 07007b8 commit 31d2874

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

sound/soc/sof/ipc4-pcm.c

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,20 @@
1515
#include "ipc4-topology.h"
1616
#include "ipc4-fw-reg.h"
1717

18+
/**
19+
* struct sof_ipc4_timestamp_info - IPC4 timestamp info
20+
* @host_copier: the host copier of the pcm stream
21+
* @dai_copier: the dai copier of the pcm stream
22+
* @stream_start_offset: reported by fw in memory window
23+
* @llp_offset: llp offset in memory window
24+
*/
25+
struct sof_ipc4_timestamp_info {
26+
struct sof_ipc4_copier *host_copier;
27+
struct sof_ipc4_copier *dai_copier;
28+
u64 stream_start_offset;
29+
u32 llp_offset;
30+
};
31+
1832
static int sof_ipc4_set_multi_pipeline_state(struct snd_sof_dev *sdev, u32 state,
1933
struct ipc4_pipeline_set_state_data *trigger_list)
2034
{

sound/soc/sof/ipc4-priv.h

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -92,20 +92,6 @@ struct sof_ipc4_fw_data {
9292
struct mutex pipeline_state_mutex; /* protect pipeline triggers, ref counts and states */
9393
};
9494

95-
/**
96-
* struct sof_ipc4_timestamp_info - IPC4 timestamp info
97-
* @host_copier: the host copier of the pcm stream
98-
* @dai_copier: the dai copier of the pcm stream
99-
* @stream_start_offset: reported by fw in memory window
100-
* @llp_offset: llp offset in memory window
101-
*/
102-
struct sof_ipc4_timestamp_info {
103-
struct sof_ipc4_copier *host_copier;
104-
struct sof_ipc4_copier *dai_copier;
105-
u64 stream_start_offset;
106-
u32 llp_offset;
107-
};
108-
10995
extern const struct sof_ipc_fw_loader_ops ipc4_loader_ops;
11096
extern const struct sof_ipc_tplg_ops ipc4_tplg_ops;
11197
extern const struct sof_ipc_tplg_control_ops tplg_ipc4_control_ops;

0 commit comments

Comments
 (0)