summaryrefslogtreecommitdiff
path: root/sound/soc/sof/core.c
diff options
context:
space:
mode:
authorDaniel Baluta <daniel.baluta@nxp.com>2019-11-07 23:41:34 +0200
committerDaniel Baluta <daniel.baluta@nxp.com>2019-11-27 21:50:22 +0200
commit37ade25a5892aaf5d7e978dd8bf38b4ee4343364 (patch)
treeef03d872642bbf1effdbc6d23d2a0f3239b2f677 /sound/soc/sof/core.c
parent19fa41a7ab8226a7ca92eb72d40edc0f3a39ed63 (diff)
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>
Diffstat (limited to 'sound/soc/sof/core.c')
-rw-r--r--sound/soc/sof/core.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/sound/soc/sof/core.c b/sound/soc/sof/core.c
index f4702b49e67b..6a32eb8c0795 100644
--- a/sound/soc/sof/core.c
+++ b/sound/soc/sof/core.c
@@ -218,8 +218,10 @@ int sof_machine_check(struct snd_sof_dev *sdev)
if (!machine)
return -ENOMEM;
- ret = sof_nocodec_setup(sdev->dev, plat_data, machine,
- plat_data->desc, plat_data->desc->ops);
+ machine->drv_name = "sof-nocodec";
+ plat_data->fw_filename = plat_data->desc->nocodec_fw_filename;
+ plat_data->tplg_filename = plat_data->desc->nocodec_tplg_filename;
+ ret = sof_nocodec_setup(sdev->dev, plat_data->desc->ops);
if (ret < 0)
return ret;