mirror of
https://github.com/torvalds/linux
synced 2024-11-05 18:23:50 +00:00
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: Charles Keepax <ckeepax@opensource.cirrus.com> Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Link: https://lore.kernel.org/r/20220519154318.2153729-47-ckeepax@opensource.cirrus.com Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
059f16bc0e
commit
b99d00c724
4 changed files with 4 additions and 4 deletions
|
@ -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 = {
|
static const struct snd_soc_dai_ops samsung_i2s_dai_ops = {
|
||||||
.trigger = i2s_trigger,
|
.trigger = i2s_trigger,
|
||||||
.hw_params = i2s_hw_params,
|
.hw_params = i2s_hw_params,
|
||||||
.set_fmt_new = i2s_set_fmt,
|
.set_fmt = i2s_set_fmt,
|
||||||
.set_clkdiv = i2s_set_clkdiv,
|
.set_clkdiv = i2s_set_clkdiv,
|
||||||
.set_sysclk = i2s_set_sysclk,
|
.set_sysclk = i2s_set_sysclk,
|
||||||
.startup = i2s_startup,
|
.startup = i2s_startup,
|
||||||
|
|
|
@ -437,7 +437,7 @@ static const struct snd_soc_dai_ops s3c_pcm_dai_ops = {
|
||||||
.set_clkdiv = s3c_pcm_set_clkdiv,
|
.set_clkdiv = s3c_pcm_set_clkdiv,
|
||||||
.trigger = s3c_pcm_trigger,
|
.trigger = s3c_pcm_trigger,
|
||||||
.hw_params = s3c_pcm_hw_params,
|
.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)
|
static int s3c_pcm_dai_probe(struct snd_soc_dai *dai)
|
||||||
|
|
|
@ -666,7 +666,7 @@ int s3c_i2sv2_register_component(struct device *dev, int id,
|
||||||
ops->trigger = s3c2412_i2s_trigger;
|
ops->trigger = s3c2412_i2s_trigger;
|
||||||
if (!ops->hw_params)
|
if (!ops->hw_params)
|
||||||
ops->hw_params = s3c_i2sv2_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_clkdiv = s3c2412_i2s_set_clkdiv;
|
||||||
ops->set_sysclk = s3c_i2sv2_set_sysclk;
|
ops->set_sysclk = s3c_i2sv2_set_sysclk;
|
||||||
|
|
||||||
|
|
|
@ -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 = {
|
static const struct snd_soc_dai_ops s3c24xx_i2s_dai_ops = {
|
||||||
.trigger = s3c24xx_i2s_trigger,
|
.trigger = s3c24xx_i2s_trigger,
|
||||||
.hw_params = s3c24xx_i2s_hw_params,
|
.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_clkdiv = s3c24xx_i2s_set_clkdiv,
|
||||||
.set_sysclk = s3c24xx_i2s_set_sysclk,
|
.set_sysclk = s3c24xx_i2s_set_sysclk,
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue