mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-24 21:24:00 +08:00
ASoC: SOF: nocodec: Amend arguments for sof_nocodec_setup()
Set the drv_name and tplg_filename for nocodec machine driver in sof_machine_check(). This means the sof_nocodec_setup() does not need the mach, plat_data or desc arguments any longer. Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com> Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Link: https://lore.kernel.org/r/20191204211556.12671-14-pierre-louis.bossart@linux.intel.com Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
5ad1cece81
commit
d612b455f1
@ -97,8 +97,5 @@ struct sof_dev_desc {
|
||||
};
|
||||
|
||||
int sof_nocodec_setup(struct device *dev,
|
||||
struct snd_sof_pdata *sof_pdata,
|
||||
struct snd_soc_acpi_mach *mach,
|
||||
const struct sof_dev_desc *desc,
|
||||
const struct snd_sof_dsp_ops *ops);
|
||||
#endif
|
||||
|
@ -63,20 +63,11 @@ static int sof_nocodec_bes_setup(struct device *dev,
|
||||
}
|
||||
|
||||
int sof_nocodec_setup(struct device *dev,
|
||||
struct snd_sof_pdata *sof_pdata,
|
||||
struct snd_soc_acpi_mach *mach,
|
||||
const struct sof_dev_desc *desc,
|
||||
const struct snd_sof_dsp_ops *ops)
|
||||
{
|
||||
struct snd_soc_dai_link *links;
|
||||
int ret;
|
||||
|
||||
if (!mach)
|
||||
return -EINVAL;
|
||||
|
||||
mach->drv_name = "sof-nocodec";
|
||||
sof_pdata->tplg_filename = desc->nocodec_tplg_filename;
|
||||
|
||||
/* create dummy BE dai_links */
|
||||
links = devm_kzalloc(dev, sizeof(struct snd_soc_dai_link) *
|
||||
ops->num_drv, GFP_KERNEL);
|
||||
|
@ -396,7 +396,10 @@ nocodec:
|
||||
if (!mach)
|
||||
return -ENOMEM;
|
||||
|
||||
ret = sof_nocodec_setup(sdev->dev, sof_pdata, mach, desc, desc->ops);
|
||||
mach->drv_name = "sof-nocodec";
|
||||
sof_pdata->tplg_filename = desc->nocodec_tplg_filename;
|
||||
|
||||
ret = sof_nocodec_setup(sdev->dev, desc->ops);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user