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>

diff --git a/include/sound/sof.h b/include/sound/sof.h
index 96625355aa94ce988625e51cdadbef953980914a..6ea74f1a9ec2741f3d0f8e2436d75c68807cc11c 100644 (file)
--- a/include/sound/sof.h
+++ b/include/sound/sof.h
@@ -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

diff --git a/sound/soc/sof/nocodec.c b/sound/soc/sof/nocodec.c
index 56d887545da307b39a779ccebda54f9af50450b8..2233146386ccf4cd23a1a5ab20a2e0f0f2539c8a 100644 (file)
--- a/sound/soc/sof/nocodec.c
+++ b/sound/soc/sof/nocodec.c
@@ -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);

diff --git a/sound/soc/sof/sof-audio.c b/sound/soc/sof/sof-audio.c
index 9c3851bfe78827e16de6e7a90a553f87bf7e1ad1..0d8f65b9ae25c8ba22493963cdd979f134af0c21 100644 (file)
--- a/sound/soc/sof/sof-audio.c
+++ b/sound/soc/sof/sof-audio.c
@@ -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;