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

ASoC: samsung: 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>
Acked-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/r/20220519154318.2153729-47-ckeepax@opensource.cirrus.com


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

sound/soc/samsung/i2s.c

+1 −1
Original line number Diff line number Diff line
@@ -1107,7 +1107,7 @@ static int samsung_i2s_dai_remove(struct snd_soc_dai *dai) 
static const struct snd_soc_dai_ops samsung_i2s_dai_ops = {

	.trigger = i2s_trigger,

	.hw_params = i2s_hw_params,

	.set_fmt_new = i2s_set_fmt,

	.set_fmt = i2s_set_fmt,

	.set_clkdiv = i2s_set_clkdiv,

	.set_sysclk = i2s_set_sysclk,

	.startup = i2s_startup,

sound/soc/samsung/pcm.c

+1 −1
Original line number Diff line number Diff line
@@ -437,7 +437,7 @@ static const struct snd_soc_dai_ops s3c_pcm_dai_ops = { 
	.set_clkdiv	= s3c_pcm_set_clkdiv,

	.trigger	= s3c_pcm_trigger,

	.hw_params	= s3c_pcm_hw_params,

	.set_fmt_new	= s3c_pcm_set_fmt,

	.set_fmt	= s3c_pcm_set_fmt,

};



static int s3c_pcm_dai_probe(struct snd_soc_dai *dai)

sound/soc/samsung/s3c-i2s-v2.c

+1 −1
Original line number Diff line number Diff line
@@ -666,7 +666,7 @@ int s3c_i2sv2_register_component(struct device *dev, int id, 
	ops->trigger = s3c2412_i2s_trigger;

	if (!ops->hw_params)

		ops->hw_params = s3c_i2sv2_hw_params;

	ops->set_fmt_new = s3c2412_i2s_set_fmt;

	ops->set_fmt = s3c2412_i2s_set_fmt;

	ops->set_clkdiv = s3c2412_i2s_set_clkdiv;

	ops->set_sysclk = s3c_i2sv2_set_sysclk;

sound/soc/samsung/s3c24xx-i2s.c

+1 −1
Original line number Diff line number Diff line
@@ -394,7 +394,7 @@ static int s3c24xx_i2s_resume(struct snd_soc_component *component) 
static const struct snd_soc_dai_ops s3c24xx_i2s_dai_ops = {

	.trigger	= s3c24xx_i2s_trigger,

	.hw_params	= s3c24xx_i2s_hw_params,

	.set_fmt_new	= s3c24xx_i2s_set_fmt,

	.set_fmt	= s3c24xx_i2s_set_fmt,

	.set_clkdiv	= s3c24xx_i2s_set_clkdiv,

	.set_sysclk	= s3c24xx_i2s_set_sysclk,

};