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

ASoC: sh: 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-48-ckeepax@opensource.cirrus.com


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

sound/soc/sh/fsi.c

+1 −1
Original line number Diff line number Diff line
@@ -1724,7 +1724,7 @@ static const struct snd_soc_dai_ops fsi_dai_ops = { 
	.startup	= fsi_dai_startup,

	.shutdown	= fsi_dai_shutdown,

	.trigger	= fsi_dai_trigger,

	.set_fmt_new	= fsi_dai_set_fmt,

	.set_fmt	= fsi_dai_set_fmt,

	.hw_params	= fsi_dai_hw_params,

	.auto_selectable_formats	= &fsi_dai_formats,

	.num_auto_selectable_formats	= 1,

sound/soc/sh/rcar/core.c

+1 −1
Original line number Diff line number Diff line
@@ -1068,7 +1068,7 @@ static const struct snd_soc_dai_ops rsnd_soc_dai_ops = { 
	.startup	= rsnd_soc_dai_startup,

	.shutdown	= rsnd_soc_dai_shutdown,

	.trigger	= rsnd_soc_dai_trigger,

	.set_fmt_new	= rsnd_soc_dai_set_fmt,

	.set_fmt	= rsnd_soc_dai_set_fmt,

	.set_tdm_slot	= rsnd_soc_set_dai_tdm_slot,

	.prepare	= rsnd_soc_dai_prepare,

	.auto_selectable_formats	= rsnd_soc_dai_formats,

sound/soc/sh/rz-ssi.c

+1 −1
Original line number Diff line number Diff line
@@ -840,7 +840,7 @@ static int rz_ssi_dai_hw_params(struct snd_pcm_substream *substream, 


static const struct snd_soc_dai_ops rz_ssi_dai_ops = {

	.trigger	= rz_ssi_dai_trigger,

	.set_fmt_new	= rz_ssi_dai_set_fmt,

	.set_fmt	= rz_ssi_dai_set_fmt,

	.hw_params	= rz_ssi_dai_hw_params,

};

sound/soc/sh/ssi.c

+1 −1
Original line number Diff line number Diff line
@@ -336,7 +336,7 @@ static const struct snd_soc_dai_ops ssi_dai_ops = { 
	.hw_params	= ssi_hw_params,

	.set_sysclk	= ssi_set_sysclk,

	.set_clkdiv	= ssi_set_clkdiv,

	.set_fmt_new	= ssi_set_fmt,

	.set_fmt	= ssi_set_fmt,

};



static struct snd_soc_dai_driver sh4_ssi_dai[] = {