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>

diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h
index 9c1d92d5a3738088d1c58782dbf7e9f68fdd38d2..ea75096720864a1f2598d4aeb555f36249804c69 100644 (file)
--- a/include/sound/soc-dai.h
+++ b/include/sound/soc-dai.h
@@ -288,7 +288,6 @@ struct snd_soc_dai_ops {
         * Called by soc_card drivers, normally in their hw_params.
         */
        int (*set_fmt)(struct snd_soc_dai *dai, unsigned int fmt);
-       int (*set_fmt_new)(struct snd_soc_dai *dai, unsigned int fmt);
        int (*xlate_tdm_slot_mask)(unsigned int slots,
                unsigned int *tx_mask, unsigned int *rx_mask);
        int (*set_tdm_slot)(struct snd_soc_dai *dai,

diff --git a/sound/soc/soc-dai.c b/sound/soc/soc-dai.c
index 996712f4d9bfdda822ae3966534f1502686d8553..d530e8c2b77b1a83cc6c4559cd9c47e5ef30758d 100644 (file)
--- 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);