Re: [PATCH 07/11] ASoC: jz4740-i2s: Remove some unused macros

From: Paul Cercueil
Date: Thu Jul 07 2022 - 05:42:43 EST




Le mer., juil. 6 2022 at 22:13:26 +0100, Aidan MacDonald <aidanmacdonald.0x0@xxxxxxxxx> a écrit :
These macros are unused and can be dropped; the information is now
encoded in regmap fields.

Signed-off-by: Aidan MacDonald <aidanmacdonald.0x0@xxxxxxxxx>

I think you can remove the macros in the patches where they are being made obsolete.

Cheers,
-Paul

---
sound/soc/jz4740/jz4740-i2s.c | 13 -------------
1 file changed, 13 deletions(-)

diff --git a/sound/soc/jz4740/jz4740-i2s.c b/sound/soc/jz4740/jz4740-i2s.c
index 3c3cf78bf848..b8d2723c5f90 100644
--- a/sound/soc/jz4740/jz4740-i2s.c
+++ b/sound/soc/jz4740/jz4740-i2s.c
@@ -35,8 +35,6 @@
#define JZ_REG_AIC_CLK_DIV 0x30
#define JZ_REG_AIC_FIFO 0x34

-#define JZ_AIC_CONF_FIFO_RX_THRESHOLD_MASK (0xf << 12)
-#define JZ_AIC_CONF_FIFO_TX_THRESHOLD_MASK (0xf << 8)
#define JZ_AIC_CONF_OVERFLOW_PLAY_LAST BIT(6)
#define JZ_AIC_CONF_INTERNAL_CODEC BIT(5)
#define JZ_AIC_CONF_I2S BIT(4)
@@ -45,11 +43,6 @@
#define JZ_AIC_CONF_SYNC_CLK_MASTER BIT(1)
#define JZ_AIC_CONF_ENABLE BIT(0)

-#define JZ_AIC_CONF_FIFO_RX_THRESHOLD_OFFSET 12
-#define JZ_AIC_CONF_FIFO_TX_THRESHOLD_OFFSET 8
-#define JZ4760_AIC_CONF_FIFO_RX_THRESHOLD_OFFSET 24
-#define JZ4760_AIC_CONF_FIFO_TX_THRESHOLD_OFFSET 16
-
#define JZ_AIC_CTRL_OUTPUT_SAMPLE_SIZE GENMASK(21, 19)
#define JZ_AIC_CTRL_INPUT_SAMPLE_SIZE GENMASK(18, 16)
#define JZ_AIC_CTRL_ENABLE_RX_DMA BIT(15)
@@ -73,12 +66,6 @@

#define JZ_AIC_I2S_STATUS_BUSY BIT(2)

-#define JZ_AIC_CLK_DIV_MASK 0xf
-#define I2SDIV_DV_SHIFT 0
-#define I2SDIV_DV_MASK (0xf << I2SDIV_DV_SHIFT)
-#define I2SDIV_IDV_SHIFT 8
-#define I2SDIV_IDV_MASK (0xf << I2SDIV_IDV_SHIFT)
-
struct i2s_soc_info {
struct snd_soc_dai_driver *dai;

--
2.35.1