summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2025-03-04 17:43:50 +0300
committerMark Brown <broonie@kernel.org>2025-03-04 17:43:50 +0300
commitee3cce59b1cecad7edd2022a443c8607faa9a4ad (patch)
treea26a0e88c1365a8f2676a4c5d1bc167ac1667c74 /include
parent56e8bbb7a0d1b15a1af87fc7d6a73469f6ed4bd2 (diff)
parent0f68f56ab7be101fc949177774107769e63f13e9 (diff)
downloadlinux-ee3cce59b1cecad7edd2022a443c8607faa9a4ad.tar.xz
ASoC: use inclusive language for
Merge series from Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>: We have both (A) SND_SOC_DAIFMT_CB{M/S}_CF{M/S} : Master/Slave. (B) SND_SOC_DAIFMT_CB{P/C}_CF{P/S} : Provider/Consumer We should use (B), and want to remove (A). This patch-set do it.
Diffstat (limited to 'include')
-rw-r--r--include/sound/soc-dai.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h
index a11501752637..c3a3ba4b0bb7 100644
--- a/include/sound/soc-dai.h
+++ b/include/sound/soc-dai.h
@@ -118,12 +118,6 @@ struct snd_compr_stream;
#define SND_SOC_DAIFMT_CBP_CFC (3 << 12) /* codec clk provider & frame consumer */
#define SND_SOC_DAIFMT_CBC_CFC (4 << 12) /* codec clk consumer & frame consumer */
-/* previous definitions kept for backwards-compatibility, do not use in new contributions */
-#define SND_SOC_DAIFMT_CBM_CFM SND_SOC_DAIFMT_CBP_CFP
-#define SND_SOC_DAIFMT_CBS_CFM SND_SOC_DAIFMT_CBC_CFP
-#define SND_SOC_DAIFMT_CBM_CFS SND_SOC_DAIFMT_CBP_CFC
-#define SND_SOC_DAIFMT_CBS_CFS SND_SOC_DAIFMT_CBC_CFC
-
/* when passed to set_fmt directly indicate if the device is provider or consumer */
#define SND_SOC_DAIFMT_BP_FP SND_SOC_DAIFMT_CBP_CFP
#define SND_SOC_DAIFMT_BC_FP SND_SOC_DAIFMT_CBC_CFP