Unverified Commit d612b455 authored by Ranjani Sridharan's avatar Ranjani Sridharan Committed by Mark Brown
Browse files

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: default avatarDaniel Baluta <daniel.baluta@nxp.com>
Signed-off-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Signed-off-by: default avatarPierre-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: default avatarMark Brown <broonie@kernel.org>
parent 5ad1cece

include/sound/sof.h

+0 −3
Original line number Diff line number Diff line
@@ -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

sound/soc/sof/nocodec.c

+0 −9
Original line number Diff line number Diff line
@@ -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);

sound/soc/sof/sof-audio.c

+4 −1
Original line number Diff line number Diff line
@@ -396,7 +396,10 @@ int sof_machine_check(struct snd_sof_dev *sdev) 
	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;