| Message ID | 20220706211330.120198-6-aidanmacdonald.0x0@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | ASoC: cleanups and improvements for jz4740-i2s | expand |
Le mer., juil. 6 2022 at 22:13:24 +0100, Aidan MacDonald <aidanmacdonald.0x0@gmail.com> a écrit : > Using version IDs makes the code hard to follow -- it's better to > describe the functional differences between SoCs instead. Remove > the IDs since they're no longer used. > > Signed-off-by: Aidan MacDonald <aidanmacdonald.0x0@gmail.com> Acked-by: Paul Cercueil <paul@crapouillou.net> Cheers, -Paul > --- > sound/soc/jz4740/jz4740-i2s.c | 12 ------------ > 1 file changed, 12 deletions(-) > > diff --git a/sound/soc/jz4740/jz4740-i2s.c > b/sound/soc/jz4740/jz4740-i2s.c > index cbb89f724f64..8bb9449d13d3 100644 > --- a/sound/soc/jz4740/jz4740-i2s.c > +++ b/sound/soc/jz4740/jz4740-i2s.c > @@ -81,15 +81,7 @@ > #define I2SDIV_IDV_SHIFT 8 > #define I2SDIV_IDV_MASK (0xf << I2SDIV_IDV_SHIFT) > > -enum jz47xx_i2s_version { > - JZ_I2S_JZ4740, > - JZ_I2S_JZ4760, > - JZ_I2S_JZ4770, > - JZ_I2S_JZ4780, > -}; > - > struct i2s_soc_info { > - enum jz47xx_i2s_version version; > struct snd_soc_dai_driver *dai; > > struct reg_field field_rx_fifo_thresh; > @@ -406,7 +398,6 @@ static struct snd_soc_dai_driver jz4740_i2s_dai = > { > }; > > static const struct i2s_soc_info jz4740_i2s_soc_info = { > - .version = JZ_I2S_JZ4740, > .dai = &jz4740_i2s_dai, > .field_rx_fifo_thresh = REG_FIELD(JZ_REG_AIC_CONF, 12, 15), > .field_tx_fifo_thresh = REG_FIELD(JZ_REG_AIC_CONF, 8, 11), > @@ -415,7 +406,6 @@ static const struct i2s_soc_info > jz4740_i2s_soc_info = { > }; > > static const struct i2s_soc_info jz4760_i2s_soc_info = { > - .version = JZ_I2S_JZ4760, > .dai = &jz4740_i2s_dai, > .field_rx_fifo_thresh = REG_FIELD(JZ_REG_AIC_CONF, 24, 27), > .field_tx_fifo_thresh = REG_FIELD(JZ_REG_AIC_CONF, 16, 20), > @@ -442,7 +432,6 @@ static struct snd_soc_dai_driver jz4770_i2s_dai = > { > }; > > static const struct i2s_soc_info jz4770_i2s_soc_info = { > - .version = JZ_I2S_JZ4770, > .dai = &jz4770_i2s_dai, > .field_rx_fifo_thresh = REG_FIELD(JZ_REG_AIC_CONF, 24, 27), > .field_tx_fifo_thresh = REG_FIELD(JZ_REG_AIC_CONF, 16, 20), > @@ -451,7 +440,6 @@ static const struct i2s_soc_info > jz4770_i2s_soc_info = { > }; > > static const struct i2s_soc_info jz4780_i2s_soc_info = { > - .version = JZ_I2S_JZ4780, > .dai = &jz4770_i2s_dai, > .field_rx_fifo_thresh = REG_FIELD(JZ_REG_AIC_CONF, 24, 27), > .field_tx_fifo_thresh = REG_FIELD(JZ_REG_AIC_CONF, 16, 20), > -- > 2.35.1 >
diff --git a/sound/soc/jz4740/jz4740-i2s.c b/sound/soc/jz4740/jz4740-i2s.c index cbb89f724f64..8bb9449d13d3 100644 --- a/sound/soc/jz4740/jz4740-i2s.c +++ b/sound/soc/jz4740/jz4740-i2s.c @@ -81,15 +81,7 @@ #define I2SDIV_IDV_SHIFT 8 #define I2SDIV_IDV_MASK (0xf << I2SDIV_IDV_SHIFT) -enum jz47xx_i2s_version { - JZ_I2S_JZ4740, - JZ_I2S_JZ4760, - JZ_I2S_JZ4770, - JZ_I2S_JZ4780, -}; - struct i2s_soc_info { - enum jz47xx_i2s_version version; struct snd_soc_dai_driver *dai; struct reg_field field_rx_fifo_thresh; @@ -406,7 +398,6 @@ static struct snd_soc_dai_driver jz4740_i2s_dai = { }; static const struct i2s_soc_info jz4740_i2s_soc_info = { - .version = JZ_I2S_JZ4740, .dai = &jz4740_i2s_dai, .field_rx_fifo_thresh = REG_FIELD(JZ_REG_AIC_CONF, 12, 15), .field_tx_fifo_thresh = REG_FIELD(JZ_REG_AIC_CONF, 8, 11), @@ -415,7 +406,6 @@ static const struct i2s_soc_info jz4740_i2s_soc_info = { }; static const struct i2s_soc_info jz4760_i2s_soc_info = { - .version = JZ_I2S_JZ4760, .dai = &jz4740_i2s_dai, .field_rx_fifo_thresh = REG_FIELD(JZ_REG_AIC_CONF, 24, 27), .field_tx_fifo_thresh = REG_FIELD(JZ_REG_AIC_CONF, 16, 20), @@ -442,7 +432,6 @@ static struct snd_soc_dai_driver jz4770_i2s_dai = { }; static const struct i2s_soc_info jz4770_i2s_soc_info = { - .version = JZ_I2S_JZ4770, .dai = &jz4770_i2s_dai, .field_rx_fifo_thresh = REG_FIELD(JZ_REG_AIC_CONF, 24, 27), .field_tx_fifo_thresh = REG_FIELD(JZ_REG_AIC_CONF, 16, 20), @@ -451,7 +440,6 @@ static const struct i2s_soc_info jz4770_i2s_soc_info = { }; static const struct i2s_soc_info jz4780_i2s_soc_info = { - .version = JZ_I2S_JZ4780, .dai = &jz4770_i2s_dai, .field_rx_fifo_thresh = REG_FIELD(JZ_REG_AIC_CONF, 24, 27), .field_tx_fifo_thresh = REG_FIELD(JZ_REG_AIC_CONF, 16, 20),
Using version IDs makes the code hard to follow -- it's better to describe the functional differences between SoCs instead. Remove the IDs since they're no longer used. Signed-off-by: Aidan MacDonald <aidanmacdonald.0x0@gmail.com> --- sound/soc/jz4740/jz4740-i2s.c | 12 ------------ 1 file changed, 12 deletions(-)