leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ASoC: soc-dai: Remove set_fmt_new callback

Browse Source 
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>
This commit is contained in:
Charles Keepax 2022-05-19 16:43:17 +01:00 committed by Mark Brown
parent 58e23e21d1
commit 19423951a4
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/sound/soc-dai.h
View File

@ -288,7 +288,6 @@ struct snd_soc_dai_ops {
* Called by soc_card drivers, normally in their hw_params. * Called by soc_card drivers, normally in their hw_params.
*/ */
int (*set_fmt)(struct snd_soc_dai *dai, unsigned int fmt); 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, int (*xlate_tdm_slot_mask)(unsigned int slots,
unsigned int *tx_mask, unsigned int *rx_mask); unsigned int *tx_mask, unsigned int *rx_mask);
int (*set_tdm_slot)(struct snd_soc_dai *dai, int (*set_tdm_slot)(struct snd_soc_dai *dai,

6
sound/soc/soc-dai.c
View File

@ -208,11 +208,7 @@ int snd_soc_dai_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
{ {
int ret = -ENOTSUPP; int ret = -ENOTSUPP;
if (dai->driver->ops && if (dai->driver->ops && dai->driver->ops->set_fmt)
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)
ret = dai->driver->ops->set_fmt(dai, fmt); ret = dai->driver->ops->set_fmt(dai, fmt);
return soc_dai_ret(dai, ret); return soc_dai_ret(dai, ret);