diff options
| author |   Charles Keepax <ckeepax@opensource.cirrus.com> | 2022-05-19 16:43:17 +0100 |
|---|---|---|
| committer |   Mark Brown <broonie@kernel.org> | 2022-06-06 12:34:21 +0100 |
| commit | 19423951a4b5c4f0ca107d6a4bed23f3f63718ca (patch) | |
| tree | c5963059543a668451d3b1321561491fa305e900 | |
| parent | ASoC: xtensa: Rename set_fmt_new back to set_fmt (diff) | |
| download | linux-dev-19423951a4b5c4f0ca107d6a4bed23f3f63718ca.tar.xz linux-dev-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>
| -rw-r--r-- | include/sound/soc-dai.h | 1 | ||||
| -rw-r--r-- | sound/soc/soc-dai.c | 6 |
2 files changed, 1 insertions, 6 deletions
diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h index 9c1d92d5a373..ea7509672086 100644 --- 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 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); |