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

ASoC: SOF: remove const qualifier for 'struct snd_sof_dsp_ops' 



Now that we start having multiple platforms with minor variants, the
use of the const qualifier for 'dsp_ops' is starting to be
sub-optimal: the structures are copied across platforms, with only a
couple of members that differ.

This patch removes the const qualifier without any functionality
changes, and adds an optional initialization callback. In follow-up
patches, the dsp_ops will revisited for Intel HDaudio platforms, with
the differences added programmatically over a common baseline.

Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: default avatarPéter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: default avatarKai Vehmanen <kai.vehmanen@linux.intel.com>
Reviewed-by: default avatarRander Wang <rander.wang@intel.com>
Reviewed-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Link: https://lore.kernel.org/r/20220414184817.362215-9-pierre-louis.bossart@linux.intel.com


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

include/sound/sof.h

+3 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <sound/soc-acpi.h>



struct snd_sof_dsp_ops;

struct snd_sof_dev;



/**

 * enum sof_fw_state - DSP firmware state definitions
@@ -135,7 +136,8 @@ struct sof_dev_desc { 
	/* default firmware name */

	const char *default_fw_filename[SOF_IPC_TYPE_COUNT];



	const struct snd_sof_dsp_ops *ops;

	struct snd_sof_dsp_ops *ops;

	int (*ops_init)(struct snd_sof_dev *sdev);

};



int sof_dai_get_mclk(struct snd_soc_pcm_runtime *rtd);

sound/soc/sof/amd/acp.h

+1 −1
Original line number Diff line number Diff line
@@ -204,7 +204,7 @@ int acp_pcm_hw_params(struct snd_sof_dev *sdev, struct snd_pcm_substream *substr 
		      struct snd_pcm_hw_params *params,

		      struct snd_sof_platform_stream_params *platform_params);



extern const struct snd_sof_dsp_ops sof_renoir_ops;

extern struct snd_sof_dsp_ops sof_renoir_ops;



/* Machine configuration */

int snd_amd_acp_find_config(struct pci_dev *pci);

sound/soc/sof/amd/renoir.c

+1 −1
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ static struct snd_soc_acpi_mach *amd_sof_machine_select(struct snd_sof_dev *sdev 
}



/* AMD Renoir DSP ops */

const struct snd_sof_dsp_ops sof_renoir_ops = {

struct snd_sof_dsp_ops sof_renoir_ops = {

	/* probe and remove */

	.probe			= amd_sof_acp_probe,

	.remove			= amd_sof_acp_remove,

sound/soc/sof/core.c

+3 −0
Original line number Diff line number Diff line
@@ -357,6 +357,9 @@ int snd_sof_device_probe(struct device *dev, struct snd_sof_pdata *plat_data) 
	sdev->first_boot = true;

	dev_set_drvdata(dev, sdev);



	/* init ops, if necessary */

	sof_ops_init(sdev);



	/* check all mandatory ops */

	if (!sof_ops(sdev) || !sof_ops(sdev)->probe || !sof_ops(sdev)->run ||

	    !sof_ops(sdev)->block_read || !sof_ops(sdev)->block_write ||

sound/soc/sof/debug.c

+1 −1
Original line number Diff line number Diff line
@@ -331,7 +331,7 @@ EXPORT_SYMBOL_GPL(snd_sof_dbg_memory_info_init); 


int snd_sof_dbg_init(struct snd_sof_dev *sdev)

{

	const struct snd_sof_dsp_ops *ops = sof_ops(sdev);

	struct snd_sof_dsp_ops *ops = sof_ops(sdev);

	const struct snd_sof_debugfs_map *map;

	int i;

	int err;