Commit febac07b authored by Charles Keepax's avatar Charles Keepax Committed by Mark Brown

ASoC: intel: sof_sdw: Remove redundant parameters in dai creation

Pull the device and mach struct out of the card rather than explicitly
passing to sof_card_dai_links_create.
Reviewed-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: default avatarRander Wang <rander.wang@intel.com>
Signed-off-by: default avatarCharles Keepax <ckeepax@opensource.cirrus.com>
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20230731214257.444605-17-pierre-louis.bossart@linux.intel.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 855e69f4
...@@ -1348,8 +1348,7 @@ static void set_dailink_map(struct snd_soc_dai_link_codec_ch_map *sdw_codec_ch_m ...@@ -1348,8 +1348,7 @@ static void set_dailink_map(struct snd_soc_dai_link_codec_ch_map *sdw_codec_ch_m
static const char * const type_strings[] = {"SimpleJack", "SmartAmp", "SmartMic"}; static const char * const type_strings[] = {"SimpleJack", "SmartAmp", "SmartMic"};
static int create_sdw_dailink(struct snd_soc_card *card, static int create_sdw_dailink(struct snd_soc_card *card, int *link_index,
struct device *dev, int *link_index,
struct snd_soc_dai_link *dai_links, struct snd_soc_dai_link *dai_links,
int sdw_be_num, int sdw_cpu_dai_num, int sdw_be_num, int sdw_cpu_dai_num,
struct snd_soc_dai_link_component *cpus, struct snd_soc_dai_link_component *cpus,
...@@ -1363,6 +1362,7 @@ static int create_sdw_dailink(struct snd_soc_card *card, ...@@ -1363,6 +1362,7 @@ static int create_sdw_dailink(struct snd_soc_card *card,
int adr_index, int adr_index,
int dai_index) int dai_index)
{ {
struct device *dev = card->dev;
const struct snd_soc_acpi_link_adr *adr_link_next; const struct snd_soc_acpi_link_adr *adr_link_next;
struct snd_soc_dai_link_component *codecs; struct snd_soc_dai_link_component *codecs;
struct sof_sdw_codec_info *codec_info; struct sof_sdw_codec_info *codec_info;
...@@ -1563,10 +1563,10 @@ static int sof_card_codec_conf_alloc(struct device *dev, ...@@ -1563,10 +1563,10 @@ static int sof_card_codec_conf_alloc(struct device *dev,
return 0; return 0;
} }
static int sof_card_dai_links_create(struct device *dev, static int sof_card_dai_links_create(struct snd_soc_card *card)
struct snd_soc_acpi_mach *mach,
struct snd_soc_card *card)
{ {
struct device *dev = card->dev;
struct snd_soc_acpi_mach *mach = dev_get_platdata(card->dev);
int ssp_num, sdw_be_num = 0, hdmi_num = 0, dmic_num; int ssp_num, sdw_be_num = 0, hdmi_num = 0, dmic_num;
struct mc_private *ctx = snd_soc_card_get_drvdata(card); struct mc_private *ctx = snd_soc_card_get_drvdata(card);
struct snd_soc_dai_link_component *idisp_components; struct snd_soc_dai_link_component *idisp_components;
...@@ -1723,7 +1723,7 @@ static int sof_card_dai_links_create(struct device *dev, ...@@ -1723,7 +1723,7 @@ static int sof_card_dai_links_create(struct device *dev,
return codec_index; return codec_index;
for (j = 0; j < codec_info_list[codec_index].dai_num ; j++) { for (j = 0; j < codec_info_list[codec_index].dai_num ; j++) {
ret = create_sdw_dailink(card, dev, &link_index, dai_links, ret = create_sdw_dailink(card, &link_index, dai_links,
sdw_be_num, sdw_cpu_dai_num, cpus, sdw_be_num, sdw_cpu_dai_num, cpus,
adr_link, &cpu_id, group_generated, adr_link, &cpu_id, group_generated,
codec_conf, codec_conf_count, codec_conf, codec_conf_count,
...@@ -1991,7 +1991,7 @@ static int mc_probe(struct platform_device *pdev) ...@@ -1991,7 +1991,7 @@ static int mc_probe(struct platform_device *pdev)
log_quirks(card->dev); log_quirks(card->dev);
ret = sof_card_dai_links_create(card->dev, mach, card); ret = sof_card_dai_links_create(card);
if (ret < 0) if (ret < 0)
return ret; return ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment