Unverified Commit 96990cfe authored by Vijendar Mukunda's avatar Vijendar Mukunda Committed by Mark Brown
Browse files

ASoC: intel: rename soundwire machine driver soc ops 

Rename Soundwire generic machine driver soc ops with tag "asoc".

Link: https://github.com/thesofproject/linux/pull/5068


Signed-off-by: default avatarVijendar Mukunda <Vijendar.Mukunda@amd.com>
Reviewed-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://patch.msgid.link/20240801091446.10457-4-Vijendar.Mukunda@amd.com


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

sound/soc/intel/boards/sof_sdw.c

+13 −13
Original line number Diff line number Diff line
@@ -594,12 +594,12 @@ static const struct snd_kcontrol_new rt700_controls[] = { 
};



/* these wrappers are only needed to avoid typecast compilation errors */

int sdw_startup(struct snd_pcm_substream *substream)

int asoc_sdw_startup(struct snd_pcm_substream *substream)

{

	return sdw_startup_stream(substream);

}



int sdw_prepare(struct snd_pcm_substream *substream)

int asoc_sdw_prepare(struct snd_pcm_substream *substream)

{

	struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);

	struct sdw_stream_runtime *sdw_stream;
@@ -617,7 +617,7 @@ int sdw_prepare(struct snd_pcm_substream *substream) 
	return sdw_prepare_stream(sdw_stream);

}



int sdw_trigger(struct snd_pcm_substream *substream, int cmd)

int asoc_sdw_trigger(struct snd_pcm_substream *substream, int cmd)

{

	struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);

	struct sdw_stream_runtime *sdw_stream;
@@ -656,7 +656,7 @@ int sdw_trigger(struct snd_pcm_substream *substream, int cmd) 
	return ret;

}



int sdw_hw_params(struct snd_pcm_substream *substream,

int asoc_sdw_hw_params(struct snd_pcm_substream *substream,

		       struct snd_pcm_hw_params *params)

{

	struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);
@@ -699,7 +699,7 @@ int sdw_hw_params(struct snd_pcm_substream *substream, 
	return 0;

}



int sdw_hw_free(struct snd_pcm_substream *substream)

int asoc_sdw_hw_free(struct snd_pcm_substream *substream)

{

	struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);

	struct sdw_stream_runtime *sdw_stream;
@@ -717,18 +717,18 @@ int sdw_hw_free(struct snd_pcm_substream *substream) 
	return sdw_deprepare_stream(sdw_stream);

}



void sdw_shutdown(struct snd_pcm_substream *substream)

void asoc_sdw_shutdown(struct snd_pcm_substream *substream)

{

	sdw_shutdown_stream(substream);

}



static const struct snd_soc_ops sdw_ops = {

	.startup = sdw_startup,

	.prepare = sdw_prepare,

	.trigger = sdw_trigger,

	.hw_params = sdw_hw_params,

	.hw_free = sdw_hw_free,

	.shutdown = sdw_shutdown,

	.startup = asoc_sdw_startup,

	.prepare = asoc_sdw_prepare,

	.trigger = asoc_sdw_trigger,

	.hw_params = asoc_sdw_hw_params,

	.hw_free = asoc_sdw_hw_free,

	.shutdown = asoc_sdw_shutdown,

};



static struct asoc_sdw_codec_info codec_info_list[] = {

sound/soc/intel/boards/sof_sdw_common.h

+7 −7
Original line number Diff line number Diff line
@@ -134,13 +134,13 @@ struct mc_private { 


extern unsigned long sof_sdw_quirk;



int sdw_startup(struct snd_pcm_substream *substream);

int sdw_prepare(struct snd_pcm_substream *substream);

int sdw_trigger(struct snd_pcm_substream *substream, int cmd);

int sdw_hw_params(struct snd_pcm_substream *substream,

int asoc_sdw_startup(struct snd_pcm_substream *substream);

int asoc_sdw_prepare(struct snd_pcm_substream *substream);

int asoc_sdw_trigger(struct snd_pcm_substream *substream, int cmd);

int asoc_sdw_hw_params(struct snd_pcm_substream *substream,

		       struct snd_pcm_hw_params *params);

int sdw_hw_free(struct snd_pcm_substream *substream);

void sdw_shutdown(struct snd_pcm_substream *substream);

int asoc_sdw_hw_free(struct snd_pcm_substream *substream);

void asoc_sdw_shutdown(struct snd_pcm_substream *substream);



/* generic HDMI support */

int sof_sdw_hdmi_init(struct snd_soc_pcm_runtime *rtd);

sound/soc/intel/boards/sof_sdw_maxim.c

+6 −6
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ static int mx8373_sdw_prepare(struct snd_pcm_substream *substream) 
	int ret;



	/* according to soc_pcm_prepare dai link prepare is called first */

	ret = sdw_prepare(substream);

	ret = asoc_sdw_prepare(substream);

	if (ret < 0)

		return ret;
@@ -92,7 +92,7 @@ static int mx8373_sdw_hw_free(struct snd_pcm_substream *substream) 
	int ret;



	/* according to soc_pcm_hw_free dai link free is called first */

	ret = sdw_hw_free(substream);

	ret = asoc_sdw_hw_free(substream);

	if (ret < 0)

		return ret;
@@ -100,12 +100,12 @@ static int mx8373_sdw_hw_free(struct snd_pcm_substream *substream) 
}



static const struct snd_soc_ops max_98373_sdw_ops = {

	.startup = sdw_startup,

	.startup = asoc_sdw_startup,

	.prepare = mx8373_sdw_prepare,

	.trigger = sdw_trigger,

	.hw_params = sdw_hw_params,

	.trigger = asoc_sdw_trigger,

	.hw_params = asoc_sdw_hw_params,

	.hw_free = mx8373_sdw_hw_free,

	.shutdown = sdw_shutdown,

	.shutdown = asoc_sdw_shutdown,

};



static int mx8373_sdw_late_probe(struct snd_soc_card *card)