Unverified Commit 00778276 authored by Charles Keepax's avatar Charles Keepax Committed by Mark Brown
Browse files

ASoC: fsl: Rename set_fmt_new back to set_fmt 



Now the core has been migrated across to the new direct clock
specification we can move the drivers back to the normal set_fmt
callback.

Signed-off-by: default avatarCharles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20220519154318.2153729-36-ckeepax@opensource.cirrus.com


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

sound/soc/fsl/fsl_audmix.c

+1 −1
Original line number Diff line number Diff line
@@ -317,7 +317,7 @@ static int fsl_audmix_dai_trigger(struct snd_pcm_substream *substream, int cmd, 
}



static const struct snd_soc_dai_ops fsl_audmix_dai_ops = {

	.set_fmt_new  = fsl_audmix_dai_set_fmt,

	.set_fmt  = fsl_audmix_dai_set_fmt,

	.trigger      = fsl_audmix_dai_trigger,

};

sound/soc/fsl/fsl_esai.c

+1 −1
Original line number Diff line number Diff line
@@ -790,7 +790,7 @@ static const struct snd_soc_dai_ops fsl_esai_dai_ops = { 
	.trigger = fsl_esai_trigger,

	.hw_params = fsl_esai_hw_params,

	.set_sysclk = fsl_esai_set_dai_sysclk,

	.set_fmt_new = fsl_esai_set_dai_fmt,

	.set_fmt = fsl_esai_set_dai_fmt,

	.set_tdm_slot = fsl_esai_set_dai_tdm_slot,

};

sound/soc/fsl/fsl_mqs.c

+1 −1
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ static const struct snd_soc_dai_ops fsl_mqs_dai_ops = { 
	.startup = fsl_mqs_startup,

	.shutdown = fsl_mqs_shutdown,

	.hw_params = fsl_mqs_hw_params,

	.set_fmt_new = fsl_mqs_set_dai_fmt,

	.set_fmt = fsl_mqs_set_dai_fmt,

};



static struct snd_soc_dai_driver fsl_mqs_dai = {

sound/soc/fsl/fsl_sai.c

+1 −1
Original line number Diff line number Diff line
@@ -704,7 +704,7 @@ static int fsl_sai_startup(struct snd_pcm_substream *substream, 
static const struct snd_soc_dai_ops fsl_sai_pcm_dai_ops = {

	.set_bclk_ratio	= fsl_sai_set_dai_bclk_ratio,

	.set_sysclk	= fsl_sai_set_dai_sysclk,

	.set_fmt_new	= fsl_sai_set_dai_fmt,

	.set_fmt	= fsl_sai_set_dai_fmt,

	.set_tdm_slot	= fsl_sai_set_dai_tdm_slot,

	.hw_params	= fsl_sai_hw_params,

	.hw_free	= fsl_sai_hw_free,

sound/soc/fsl/fsl_ssi.c

+1 −1
Original line number Diff line number Diff line
@@ -1156,7 +1156,7 @@ static const struct snd_soc_dai_ops fsl_ssi_dai_ops = { 
	.shutdown = fsl_ssi_shutdown,

	.hw_params = fsl_ssi_hw_params,

	.hw_free = fsl_ssi_hw_free,

	.set_fmt_new = fsl_ssi_set_dai_fmt,

	.set_fmt = fsl_ssi_set_dai_fmt,

	.set_tdm_slot = fsl_ssi_set_dai_tdm_slot,

	.trigger = fsl_ssi_trigger,

};