Unverified Commit 17e9d6b0 authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Mark Brown
Browse files

ASoC: SOF: change signature of set_mach_params() callback 



To set additional parameters, we need to have access to sdev, not the
plain vanilla struct device pointer.

No functionality change.

Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarDaniel Baluta <daniel.baluta@gmail.com>
Reviewed-by: default avatarKai Vehmanen <kai.vehmanen@linux.intel.com>
Signed-off-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/20210409220121.1542362-4-ranjani.sridharan@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent ca6a0122

sound/soc/sof/intel/bdw.c

+2 −2
Original line number Diff line number Diff line
@@ -559,12 +559,12 @@ static void bdw_machine_select(struct snd_sof_dev *sdev) 
}



static void bdw_set_mach_params(const struct snd_soc_acpi_mach *mach,

				struct device *dev)

				struct snd_sof_dev *sdev)

{

	struct snd_soc_acpi_mach_params *mach_params;



	mach_params = (struct snd_soc_acpi_mach_params *)&mach->mach_params;

	mach_params->platform = dev_name(dev);

	mach_params->platform = dev_name(sdev->dev);

}



/* Broadwell DAIs */

sound/soc/sof/intel/byt.c

+9 −9
Original line number Diff line number Diff line
@@ -427,15 +427,6 @@ static void byt_machine_select(struct snd_sof_dev *sdev) 
	sof_pdata->machine = mach;

}



static void byt_set_mach_params(const struct snd_soc_acpi_mach *mach,

				struct device *dev)

{

	struct snd_soc_acpi_mach_params *mach_params;



	mach_params = (struct snd_soc_acpi_mach_params *)&mach->mach_params;

	mach_params->platform = dev_name(dev);

}



/* Baytrail DAIs */

static struct snd_soc_dai_driver byt_dai[] = {

{
@@ -506,6 +497,15 @@ static struct snd_soc_dai_driver byt_dai[] = { 
},

};



static void byt_set_mach_params(const struct snd_soc_acpi_mach *mach,

				struct snd_sof_dev *sdev)

{

	struct snd_soc_acpi_mach_params *mach_params;



	mach_params = (struct snd_soc_acpi_mach_params *)&mach->mach_params;

	mach_params->platform = dev_name(sdev->dev);

}



/*

 * Probe and remove.

 */

sound/soc/sof/intel/hda.c

+2 −2
Original line number Diff line number Diff line
@@ -1213,12 +1213,12 @@ static int hda_sdw_machine_select(struct snd_sof_dev *sdev) 
#endif



void hda_set_mach_params(const struct snd_soc_acpi_mach *mach,

			 struct device *dev)

			 struct snd_sof_dev *sdev)

{

	struct snd_soc_acpi_mach_params *mach_params;



	mach_params = (struct snd_soc_acpi_mach_params *)&mach->mach_params;

	mach_params->platform = dev_name(dev);

	mach_params->platform = dev_name(sdev->dev);

}



void hda_machine_select(struct snd_sof_dev *sdev)

sound/soc/sof/intel/hda.h

+1 −1
Original line number Diff line number Diff line
@@ -762,7 +762,7 @@ extern const struct sof_intel_dsp_desc adls_chip_info; 
/* machine driver select */

void hda_machine_select(struct snd_sof_dev *sdev);

void hda_set_mach_params(const struct snd_soc_acpi_mach *mach,

			 struct device *dev);

			 struct snd_sof_dev *sdev);



/* PCI driver selection and probe */

int hda_pci_intel_probe(struct pci_dev *pci, const struct pci_device_id *pci_id);

sound/soc/sof/ops.h

+2 −4
Original line number Diff line number Diff line
@@ -497,12 +497,10 @@ snd_sof_machine_select(struct snd_sof_dev *sdev) 


static inline void

snd_sof_set_mach_params(const struct snd_soc_acpi_mach *mach,

			struct device *dev)

			struct snd_sof_dev *sdev)

{

	struct snd_sof_dev *sdev = dev_get_drvdata(dev);



	if (sof_ops(sdev) && sof_ops(sdev)->set_mach_params)

		sof_ops(sdev)->set_mach_params(mach, dev);

		sof_ops(sdev)->set_mach_params(mach, sdev);

}



static inline const struct snd_sof_dsp_ops