Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1710254
| From | Chen-Yu Tsai <wens@csie.org> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | Re: [linux-sunxi] [PATCH v3 04/11] ASoC: sun4i-i2s: Add regmap fields for channels |
| Date | 2017-08-12 14:10 +0200 |
| Message-ID | <udDoS-yg-35@gated-at.bofh.it> (permalink) |
| References | <udCsN-8m9-3@gated-at.bofh.it> <udCsN-8m9-13@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
On Sat, Aug 12, 2017 at 7:00 PM, <codekipper@gmail.com> wrote:
> From: Marcus Cooper <codekipper@gmail.com>
>
> On the original i2s block the channel mapping and selection were
> configured for stereo audio by default: This is not the case with
> the newer SoCs and they are also located at different offsets.
>
> To support the newer SoC then regmap fields have been added to the
> quirks and these are initialised to their correct settings during
> probing.
>
> Signed-off-by: Marcus Cooper <codekipper@gmail.com>
> Reviewed-by: Chen-Yu Tsai <wens@csie.org>
> ---
> sound/soc/sunxi/sun4i-i2s.c | 84 ++++++++++++++++++++++++++++++++++++++++-----
> 1 file changed, 76 insertions(+), 8 deletions(-)
>
> diff --git a/sound/soc/sunxi/sun4i-i2s.c b/sound/soc/sunxi/sun4i-i2s.c
> index dfb794ffff92..a65dcb013247 100644
> --- a/sound/soc/sunxi/sun4i-i2s.c
> +++ b/sound/soc/sunxi/sun4i-i2s.c
[...]
> @@ -681,14 +701,56 @@ static const struct sun4i_i2s_quirks sun4i_a10_i2s_quirks = {
> .has_reset = false,
> .reg_offset_txdata = SUN4I_I2S_FIFO_TX_REG,
> .sun4i_i2s_regmap = &sun4i_i2s_regmap_config,
> + .field_txchanmap = REG_FIELD(SUN4I_I2S_TX_CHAN_MAP_REG, 0, 31),
> + .field_rxchanmap = REG_FIELD(SUN4I_I2S_RX_CHAN_MAP_REG, 0, 31),
> + .field_txchansel = REG_FIELD(SUN4I_I2S_TX_CHAN_SEL_REG, 0, 2),
> + .field_rxchansel = REG_FIELD(SUN4I_I2S_RX_CHAN_SEL_REG, 0, 2),
> };
>
> static const struct sun4i_i2s_quirks sun6i_a31_i2s_quirks = {
> .has_reset = true,
> .reg_offset_txdata = SUN4I_I2S_FIFO_TX_REG,
> .sun4i_i2s_regmap = &sun4i_i2s_regmap_config,
> + .field_txchanmap = REG_FIELD(SUN4I_I2S_TX_CHAN_MAP_REG, 0, 31),
> + .field_rxchanmap = REG_FIELD(SUN4I_I2S_RX_CHAN_MAP_REG, 0, 31),
> + .field_txchansel = REG_FIELD(SUN4I_I2S_TX_CHAN_SEL_REG, 0, 2),
> + .field_rxchansel = REG_FIELD(SUN4I_I2S_RX_CHAN_SEL_REG, 0, 2),
> };
>
> +static int sun4i_i2s_init_regmap_fields(struct device *dev,
> + struct sun4i_i2s *i2s)
> +{
> + int ret;
> +
> + i2s->field_txchanmap =
> + devm_regmap_field_alloc(dev, i2s->regmap,
> + i2s->variant->field_txchanmap);
> + ret = PTR_ERR_OR_ZERO(i2s->field_txchanmap);
> +
> + if (!ret) {
> + i2s->field_rxchanmap =
> + devm_regmap_field_alloc(dev, i2s->regmap,
> + i2s->variant->field_rxchanmap);
> + ret = PTR_ERR_OR_ZERO(i2s->field_rxchanmap);
> + }
> +
> + if (!ret) {
> + i2s->field_txchansel =
> + devm_regmap_field_alloc(dev, i2s->regmap,
> + i2s->variant->field_txchansel);
> + ret = PTR_ERR_OR_ZERO(i2s->field_txchansel);
> + }
> +
> + if (!ret) {
> + i2s->field_rxchansel =
> + devm_regmap_field_alloc(dev, i2s->regmap,
> + i2s->variant->field_rxchansel);
> + ret = PTR_ERR_OR_ZERO(i2s->field_rxchansel);
I'm quite sure this was not what we meant when we recommended
the usage of PTR_ERR_OR_ZERO...
Rather you should have kept the
if (PTR_ERR(...))
return PTR_ERR(...);
for all but the last conditional blocks. For the last one just
return PTR_ERR_OR_ZERO(...);
Returning early, as opposed to what you have here, is also
easier to read. People looking at it will notice early on
that if something wrong happens, you bail out. Instead with
this structure, people have to read down a long list of ifs
that aren't doing anything. Not to mention that you have to
indent every code block except the first one by one tab,
reducing any screen real estate you have.
ChenYu
> + }
> +
> + return ret;
> +}
> +
> static int sun4i_i2s_probe(struct platform_device *pdev)
> {
> struct sun4i_i2s *i2s;
[...]
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH v3 00/11] ASoC: Add I2S support for Allwinner H3 SoCs codekipper@gmail.com - 2017-08-12 13:10 +0200
[PATCH v3 10/11] ASoC: sun4i-i2s: Update global enable with bitmask codekipper@gmail.com - 2017-08-12 13:10 +0200
[PATCH v3 01/11] ASoC: sun4i-i2s: Add clkdiv offsets to quirks codekipper@gmail.com - 2017-08-12 13:10 +0200
Re: [linux-sunxi] [PATCH v3 01/11] ASoC: sun4i-i2s: Add clkdiv offsets to quirks Chen-Yu Tsai <wens@csie.org> - 2017-08-12 13:50 +0200
Applied "ASoC: sun4i-i2s: Add clkdiv offsets to quirks" to the asoc tree Mark Brown <broonie@kernel.org> - 2017-08-14 18:50 +0200
[PATCH v3 05/11] ASoC: sun4i-i2s: Add regfields for word size select and sample resolution codekipper@gmail.com - 2017-08-12 13:10 +0200
[PATCH v3 07/11] ASoC: sun4i-i2s: Add mclk enable regmap field codekipper@gmail.com - 2017-08-12 13:10 +0200
[PATCH v3 09/11] ASoC: sun4i-i2s: Check for slave select bit codekipper@gmail.com - 2017-08-12 13:10 +0200
[PATCH v3 04/11] ASoC: sun4i-i2s: Add regmap fields for channels codekipper@gmail.com - 2017-08-12 13:10 +0200
Re: [linux-sunxi] [PATCH v3 04/11] ASoC: sun4i-i2s: Add regmap fields for channels Chen-Yu Tsai <wens@csie.org> - 2017-08-12 14:10 +0200
[PATCH v3 08/11] ASoC: sun4i-i2s: Add regmap field to set DAI format codekipper@gmail.com - 2017-08-12 13:10 +0200
[PATCH v3 06/11] ASoC: sun4i-i2s: bclk and lrclk polarity tidyup codekipper@gmail.com - 2017-08-12 13:10 +0200
[PATCH v3 02/11] ASoC: sun4i-i2s: Add regmap config to quirks codekipper@gmail.com - 2017-08-12 13:10 +0200
[PATCH v3 11/11] ASoC: sun4i-i2s: Add support for H3 codekipper@gmail.com - 2017-08-12 13:10 +0200
Re: [linux-sunxi] [PATCH v3 11/11] ASoC: sun4i-i2s: Add support for H3 Chen-Yu Tsai <wens@csie.org> - 2017-08-12 14:30 +0200
Re: [linux-sunxi] [PATCH v3 11/11] ASoC: sun4i-i2s: Add support for H3 Code Kipper <codekipper@gmail.com> - 2017-08-15 09:30 +0200
csiph-web