[3/5] ASoC: sdw_util/intel: move soundwire endpoint and dai link structures

Commit Message

Vijendar Mukunda Sept. 13, 2024, 9:06 a.m. UTC

Move Soundwire endpoint and dai link structures from Intel generic machine
driver code to common place holder(soc_sdw_utils.h). These structures will
be used in other platform SoundWire machine driver code.

Signed-off-by: Vijendar Mukunda <[e-mail]>
Reviewed-by: Bard Liao <[e-mail]>
---
 include/sound/soc_sdw_utils.h    | 21 +++++++++++++++++++++
 sound/soc/intel/boards/sof_sdw.c | 21 ---------------------
 2 files changed, 21 insertions(+), 21 deletions(-)

Patch

diff --git a/include/sound/soc_sdw_utils.h b/include/sound/soc_sdw_utils.h
index e366b7968c2d..e3482720a3eb 100644
--- a/include/sound/soc_sdw_utils.h
+++ b/include/sound/soc_sdw_utils.h
@@ -93,6 +93,27 @@  struct asoc_sdw_mc_private {
 	int codec_info_list_count;
 };
 
+struct asoc_sdw_endpoint {
+	struct list_head list;
+
+	u32 link_mask;
+	const char *codec_name;
+	const char *name_prefix;
+	bool include_sidecar;
+
+	struct asoc_sdw_codec_info *codec_info;
+	const struct asoc_sdw_dai_info *dai_info;
+};
+
+struct asoc_sdw_dailink {
+	bool initialised;
+
+	u8 group_id;
+	u32 link_mask[SNDRV_PCM_STREAM_LAST + 1];
+	int num_devs[SNDRV_PCM_STREAM_LAST + 1];
+	struct list_head endpoints;
+};
+
 extern struct asoc_sdw_codec_info codec_info_list[];
 int asoc_sdw_get_codec_info_list_count(void);
 
diff --git a/sound/soc/intel/boards/sof_sdw.c b/sound/soc/intel/boards/sof_sdw.c
index 222cf4a37707..6b30659f0e25 100644
--- a/sound/soc/intel/boards/sof_sdw.c
+++ b/sound/soc/intel/boards/sof_sdw.c
@@ -617,27 +617,6 @@  static const struct snd_soc_ops sdw_ops = {
 	.shutdown = asoc_sdw_shutdown,
 };
 
-struct asoc_sdw_endpoint {
-	struct list_head list;
-
-	u32 link_mask;
-	const char *codec_name;
-	const char *name_prefix;
-	bool include_sidecar;
-
-	struct asoc_sdw_codec_info *codec_info;
-	const struct asoc_sdw_dai_info *dai_info;
-};
-
-struct asoc_sdw_dailink {
-	bool initialised;
-
-	u8 group_id;
-	u32 link_mask[SNDRV_PCM_STREAM_LAST + 1];
-	int num_devs[SNDRV_PCM_STREAM_LAST + 1];
-	struct list_head endpoints;
-};
-
 static const char * const type_strings[] = {"SimpleJack", "SmartAmp", "SmartMic"};
 
 static int asoc_sdw_count_sdw_endpoints(struct snd_soc_card *card, int *num_devs, int *num_ends)