summaryrefslogtreecommitdiffstats
path: root/sound/soc/soc-dai.c
diff options
context:
space:
mode:
authorCharles Keepax <ckeepax@opensource.cirrus.com>2022-05-19 17:43:17 +0200
committerMark Brown <broonie@kernel.org>2022-06-06 13:34:21 +0200
commit19423951a4b5c4f0ca107d6a4bed23f3f63718ca (patch)
treec5963059543a668451d3b1321561491fa305e900 /sound/soc/soc-dai.c
parentASoC: xtensa: Rename set_fmt_new back to set_fmt (diff)
downloadlinux-19423951a4b5c4f0ca107d6a4bed23f3f63718ca.tar.xz
linux-19423951a4b5c4f0ca107d6a4bed23f3f63718ca.zip
ASoC: soc-dai: Remove set_fmt_new callback
Now the behaviour of the core and all drivers is updated to the new direct clock specification the temporary set_fmt_new callback can be completely removed. Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com> Link: https://lore.kernel.org/r/20220519154318.2153729-56-ckeepax@opensource.cirrus.com Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/soc-dai.c')
-rw-r--r--sound/soc/soc-dai.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/sound/soc/soc-dai.c b/sound/soc/soc-dai.c
index 996712f4d9bf..d530e8c2b77b 100644
--- a/sound/soc/soc-dai.c
+++ b/sound/soc/soc-dai.c
@@ -208,11 +208,7 @@ int snd_soc_dai_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
{
int ret = -ENOTSUPP;
- if (dai->driver->ops &&
- dai->driver->ops->set_fmt_new)
- ret = dai->driver->ops->set_fmt_new(dai, fmt);
- else if (dai->driver->ops &&
- dai->driver->ops->set_fmt)
+ if (dai->driver->ops && dai->driver->ops->set_fmt)
ret = dai->driver->ops->set_fmt(dai, fmt);
return soc_dai_ret(dai, ret);