To make it generic, rename structure 'sof_sdw_codec_info' as
'asoc_sdw_codec_info' and 'sof_sdw_dai_info' as 'asoc_sdw_dai_info'.
These structures will be moved to common header file so that it can
be used by other platform machine driver.
Link: https://github.com/thesofproject/linux/pull/5068
Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda@xxxxxxx>
Reviewed-by: Bard Liao <yung-chuan.liao@xxxxxxxxxxxxxxx>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@xxxxxxxxxxxxxxx>
---
sound/soc/intel/boards/bridge_cs35l56.c | 2 +-
sound/soc/intel/boards/sof_sdw.c | 26 +++++++++----------
sound/soc/intel/boards/sof_sdw_common.h | 24 ++++++++---------
sound/soc/intel/boards/sof_sdw_cs42l43.c | 2 +-
sound/soc/intel/boards/sof_sdw_cs_amp.c | 2 +-
sound/soc/intel/boards/sof_sdw_maxim.c | 2 +-
sound/soc/intel/boards/sof_sdw_rt711.c | 2 +-
sound/soc/intel/boards/sof_sdw_rt_amp.c | 2 +-
.../boards/sof_sdw_rt_sdca_jack_common.c | 2 +-
9 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/sound/soc/intel/boards/bridge_cs35l56.c b/sound/soc/intel/boards/bridge_cs35l56.c
index c3995e724aed..b289bcb3847a 100644
--- a/sound/soc/intel/boards/bridge_cs35l56.c
+++ b/sound/soc/intel/boards/bridge_cs35l56.c
@@ -127,7 +127,7 @@ int bridge_cs35l56_add_sidecar(struct snd_soc_card *card,
int bridge_cs35l56_spk_init(struct snd_soc_card *card,
struct snd_soc_dai_link *dai_links,
- struct sof_sdw_codec_info *info,
+ struct asoc_sdw_codec_info *info,
bool playback)
{
if (sof_sdw_quirk & SOF_SIDECAR_AMPS)
diff --git a/sound/soc/intel/boards/sof_sdw.c b/sound/soc/intel/boards/sof_sdw.c
index e5feaef669d1..26c467bb81a3 100644
--- a/sound/soc/intel/boards/sof_sdw.c
+++ b/sound/soc/intel/boards/sof_sdw.c
@@ -731,7 +731,7 @@ static const struct snd_soc_ops sdw_ops = {
.shutdown = sdw_shutdown,
};
-static struct sof_sdw_codec_info codec_info_list[] = {
+static struct asoc_sdw_codec_info codec_info_list[] = {
{
.part_id = 0x700,
.dais = {
@@ -1220,7 +1220,7 @@ static struct sof_sdw_codec_info codec_info_list[] = {
},
};
-static struct sof_sdw_codec_info *find_codec_info_part(const u64 adr)
+static struct asoc_sdw_codec_info *find_codec_info_part(const u64 adr)
{
unsigned int part_id, sdw_version;
int i;
@@ -1241,7 +1241,7 @@ static struct sof_sdw_codec_info *find_codec_info_part(const u64 adr)
}
-static struct sof_sdw_codec_info *find_codec_info_acpi(const u8 *acpi_id)
+static struct asoc_sdw_codec_info *find_codec_info_acpi(const u8 *acpi_id)
{
int i;
@@ -1255,8 +1255,8 @@ static struct sof_sdw_codec_info *find_codec_info_acpi(const u8 *acpi_id)
return NULL;
}
-static struct sof_sdw_codec_info *find_codec_info_dai(const char *dai_name,
- int *dai_index)
+static struct asoc_sdw_codec_info *find_codec_info_dai(const char *dai_name,
+ int *dai_index)
{
int i, j;
@@ -1355,7 +1355,7 @@ static bool is_unique_device(const struct snd_soc_acpi_link_adr *adr_link,
}
static const char *get_codec_name(struct device *dev,
- const struct sof_sdw_codec_info *codec_info,
+ const struct asoc_sdw_codec_info *codec_info,
const struct snd_soc_acpi_link_adr *adr_link,
int adr_index)
{
@@ -1383,7 +1383,7 @@ static const char *get_codec_name(struct device *dev,
static int sof_sdw_rtd_init(struct snd_soc_pcm_runtime *rtd)
{
struct snd_soc_card *card = rtd->card;
- struct sof_sdw_codec_info *codec_info;
+ struct asoc_sdw_codec_info *codec_info;
struct snd_soc_dai *dai;
int dai_index;
int ret;
@@ -1451,8 +1451,8 @@ struct sof_sdw_endpoint {
const char *name_prefix;
bool include_sidecar;
- struct sof_sdw_codec_info *codec_info;
- const struct sof_sdw_dai_info *dai_info;
+ struct asoc_sdw_codec_info *codec_info;
+ const struct asoc_sdw_dai_info *dai_info;
};
struct sof_sdw_dailink {
@@ -1529,7 +1529,7 @@ static int parse_sdw_endpoints(struct snd_soc_card *card,
for (i = 0; i < adr_link->num_adr; i++) {
const struct snd_soc_acpi_adr_device *adr_dev = &adr_link->adr_d[i];
- struct sof_sdw_codec_info *codec_info;
+ struct asoc_sdw_codec_info *codec_info;
const char *codec_name;
if (!adr_dev->name_prefix) {
@@ -1563,7 +1563,7 @@ static int parse_sdw_endpoints(struct snd_soc_card *card,
for (j = 0; j < adr_dev->num_endpoints; j++) {
const struct snd_soc_acpi_endpoint *adr_end;
- const struct sof_sdw_dai_info *dai_info;
+ const struct asoc_sdw_dai_info *dai_info;
struct sof_sdw_dailink *sof_dai;
int stream;
@@ -1790,7 +1790,7 @@ static int create_sdw_dailinks(struct snd_soc_card *card,
static int create_ssp_dailinks(struct snd_soc_card *card,
struct snd_soc_dai_link **dai_links, int *be_id,
- struct sof_sdw_codec_info *ssp_info,
+ struct asoc_sdw_codec_info *ssp_info,
unsigned long ssp_mask)
{
struct device *dev = card->dev;
@@ -1914,7 +1914,7 @@ static int sof_card_dai_links_create(struct snd_soc_card *card)
struct mc_private *ctx = snd_soc_card_get_drvdata(card);
struct snd_soc_acpi_mach_params *mach_params = &mach->mach_params;
struct snd_soc_codec_conf *codec_conf;
- struct sof_sdw_codec_info *ssp_info;
+ struct asoc_sdw_codec_info *ssp_info;
struct sof_sdw_endpoint *sof_ends;
struct sof_sdw_dailink *sof_dais;
int num_devs = 0;
diff --git a/sound/soc/intel/boards/sof_sdw_common.h b/sound/soc/intel/boards/sof_sdw_common.h
index 2a3145d1feb6..ebacb55de318 100644
--- a/sound/soc/intel/boards/sof_sdw_common.h
+++ b/sound/soc/intel/boards/sof_sdw_common.h
@@ -79,9 +79,9 @@ enum {
#define SOF_SDW_MAX_DAI_NUM 8
-struct sof_sdw_codec_info;
+struct asoc_sdw_codec_info;
-struct sof_sdw_dai_info {
+struct asoc_sdw_dai_info {
const bool direction[2]; /* playback & capture support */
const char *dai_name;
const int dai_type;
@@ -92,7 +92,7 @@ struct sof_sdw_dai_info {
const int num_widgets;
int (*init)(struct snd_soc_card *card,
struct snd_soc_dai_link *dai_links,
- struct sof_sdw_codec_info *info,
+ struct asoc_sdw_codec_info *info,
bool playback);
int (*exit)(struct snd_soc_card *card, struct snd_soc_dai_link *dai_link);
int (*rtd_init)(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);
@@ -100,7 +100,7 @@ struct sof_sdw_dai_info {
unsigned long quirk;
};
-struct sof_sdw_codec_info {
+struct asoc_sdw_codec_info {
const int part_id;
const int version_id;
const char *codec_name;
@@ -108,7 +108,7 @@ struct sof_sdw_codec_info {
const u8 acpi_id[ACPI_ID_LEN];
const bool ignore_pch_dmic;
const struct snd_soc_ops *ops;
- struct sof_sdw_dai_info dais[SOF_SDW_MAX_DAI_NUM];
+ struct asoc_sdw_dai_info dais[SOF_SDW_MAX_DAI_NUM];
const int dai_num;
int (*codec_card_late_probe)(struct snd_soc_card *card);
@@ -153,14 +153,14 @@ int sof_sdw_dmic_init(struct snd_soc_pcm_runtime *rtd);
/* RT711 support */
int sof_sdw_rt711_init(struct snd_soc_card *card,
struct snd_soc_dai_link *dai_links,
- struct sof_sdw_codec_info *info,
+ struct asoc_sdw_codec_info *info,
bool playback);
int sof_sdw_rt711_exit(struct snd_soc_card *card, struct snd_soc_dai_link *dai_link);
/* RT711-SDCA support */
int sof_sdw_rt_sdca_jack_init(struct snd_soc_card *card,
struct snd_soc_dai_link *dai_links,
- struct sof_sdw_codec_info *info,
+ struct asoc_sdw_codec_info *info,
bool playback);
int sof_sdw_rt_sdca_jack_exit(struct snd_soc_card *card, struct snd_soc_dai_link *dai_link);
@@ -170,20 +170,20 @@ extern const struct snd_soc_ops sof_sdw_rt1308_i2s_ops;
/* generic amp support */
int sof_sdw_rt_amp_init(struct snd_soc_card *card,
struct snd_soc_dai_link *dai_links,
- struct sof_sdw_codec_info *info,
+ struct asoc_sdw_codec_info *info,
bool playback);
int sof_sdw_rt_amp_exit(struct snd_soc_card *card, struct snd_soc_dai_link *dai_link);
/* MAXIM codec support */
int sof_sdw_maxim_init(struct snd_soc_card *card,
struct snd_soc_dai_link *dai_links,
- struct sof_sdw_codec_info *info,
+ struct asoc_sdw_codec_info *info,
bool playback);
/* CS42L43 support */
int sof_sdw_cs42l43_spk_init(struct snd_soc_card *card,
struct snd_soc_dai_link *dai_links,
- struct sof_sdw_codec_info *info,
+ struct asoc_sdw_codec_info *info,
bool playback);
/* CS AMP support */
@@ -194,12 +194,12 @@ int bridge_cs35l56_add_sidecar(struct snd_soc_card *card,
struct snd_soc_codec_conf **codec_conf);
int bridge_cs35l56_spk_init(struct snd_soc_card *card,
struct snd_soc_dai_link *dai_links,
- struct sof_sdw_codec_info *info,
+ struct asoc_sdw_codec_info *info,
bool playback);
int sof_sdw_cs_amp_init(struct snd_soc_card *card,
struct snd_soc_dai_link *dai_links,
- struct sof_sdw_codec_info *info,
+ struct asoc_sdw_codec_info *info,
bool playback);
/* dai_link init callbacks */
diff --git a/sound/soc/intel/boards/sof_sdw_cs42l43.c b/sound/soc/intel/boards/sof_sdw_cs42l43.c
index b7e2750c1074..e8370c3c96fd 100644
--- a/sound/soc/intel/boards/sof_sdw_cs42l43.c
+++ b/sound/soc/intel/boards/sof_sdw_cs42l43.c
@@ -123,7 +123,7 @@ int cs42l43_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *da
int sof_sdw_cs42l43_spk_init(struct snd_soc_card *card,
struct snd_soc_dai_link *dai_links,
- struct sof_sdw_codec_info *info,
+ struct asoc_sdw_codec_info *info,
bool playback)
{
/* Do init on playback link only. */
diff --git a/sound/soc/intel/boards/sof_sdw_cs_amp.c b/sound/soc/intel/boards/sof_sdw_cs_amp.c
index 10e08207619a..206fe7610a56 100644
--- a/sound/soc/intel/boards/sof_sdw_cs_amp.c
+++ b/sound/soc/intel/boards/sof_sdw_cs_amp.c
@@ -47,7 +47,7 @@ int cs_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai)
int sof_sdw_cs_amp_init(struct snd_soc_card *card,
struct snd_soc_dai_link *dai_links,
- struct sof_sdw_codec_info *info,
+ struct asoc_sdw_codec_info *info,
bool playback)
{
/* Do init on playback link only. */
diff --git a/sound/soc/intel/boards/sof_sdw_maxim.c b/sound/soc/intel/boards/sof_sdw_maxim.c
index b7f73177867f..8faa06824869 100644
--- a/sound/soc/intel/boards/sof_sdw_maxim.c
+++ b/sound/soc/intel/boards/sof_sdw_maxim.c
@@ -120,7 +120,7 @@ static int mx8373_sdw_late_probe(struct snd_soc_card *card)
int sof_sdw_maxim_init(struct snd_soc_card *card,
struct snd_soc_dai_link *dai_links,
- struct sof_sdw_codec_info *info,
+ struct asoc_sdw_codec_info *info,
bool playback)
{
info->amp_num++;
diff --git a/sound/soc/intel/boards/sof_sdw_rt711.c b/sound/soc/intel/boards/sof_sdw_rt711.c
index 60ff4d88e2dc..9ea8de609669 100644
--- a/sound/soc/intel/boards/sof_sdw_rt711.c
+++ b/sound/soc/intel/boards/sof_sdw_rt711.c
@@ -126,7 +126,7 @@ int sof_sdw_rt711_exit(struct snd_soc_card *card, struct snd_soc_dai_link *dai_l
int sof_sdw_rt711_init(struct snd_soc_card *card,
struct snd_soc_dai_link *dai_links,
- struct sof_sdw_codec_info *info,
+ struct asoc_sdw_codec_info *info,
bool playback)
{
struct mc_private *ctx = snd_soc_card_get_drvdata(card);
diff --git a/sound/soc/intel/boards/sof_sdw_rt_amp.c b/sound/soc/intel/boards/sof_sdw_rt_amp.c
index d1c0f91ce589..da1a8cc1c63d 100644
--- a/sound/soc/intel/boards/sof_sdw_rt_amp.c
+++ b/sound/soc/intel/boards/sof_sdw_rt_amp.c
@@ -256,7 +256,7 @@ int sof_sdw_rt_amp_exit(struct snd_soc_card *card, struct snd_soc_dai_link *dai_
int sof_sdw_rt_amp_init(struct snd_soc_card *card,
struct snd_soc_dai_link *dai_links,
- struct sof_sdw_codec_info *info,
+ struct asoc_sdw_codec_info *info,
bool playback)
{
struct mc_private *ctx = snd_soc_card_get_drvdata(card);
diff --git a/sound/soc/intel/boards/sof_sdw_rt_sdca_jack_common.c b/sound/soc/intel/boards/sof_sdw_rt_sdca_jack_common.c
index 4254e30ee4c3..b63f4952e7d1 100644
--- a/sound/soc/intel/boards/sof_sdw_rt_sdca_jack_common.c
+++ b/sound/soc/intel/boards/sof_sdw_rt_sdca_jack_common.c
@@ -180,7 +180,7 @@ int sof_sdw_rt_sdca_jack_exit(struct snd_soc_card *card, struct snd_soc_dai_link
int sof_sdw_rt_sdca_jack_init(struct snd_soc_card *card,
struct snd_soc_dai_link *dai_links,
- struct sof_sdw_codec_info *info,
+ struct asoc_sdw_codec_info *info,
bool playback)
{
struct mc_private *ctx = snd_soc_card_get_drvdata(card);
--
2.34.1
[Index of Archives]
[Pulseaudio]
[Linux Audio Users]
[ALSA Devel]
[Fedora Desktop]
[Fedora SELinux]
[Big List of Linux Books]
[Yosemite News]
[KDE Users]
