Unverified Commit 19423951 authored by Charles Keepax's avatar Charles Keepax Committed by Mark Brown
Browse files

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: default avatarCharles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20220519154318.2153729-56-ckeepax@opensource.cirrus.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 58e23e21

include/sound/soc-dai.h

+0 −1
Original line number Diff line number Diff line
@@ -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,

sound/soc/soc-dai.c

+1 −5
Original line number Diff line number Diff line
@@ -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);