Re: [PATCH v6 03/14] ASoC: sun4i-i2s: Change get_sr() and get_wss() to be more explicit

Hi Maxime,

On Mon, 5 Oct 2020 at 14:14, Maxime Ripard maxime@cerno.tech wrote:

On Sat, Oct 03, 2020 at 04:19:39PM +0200, Clément Péron wrote:

...

We are actually using a complex formula to just return a bunch of simple values. Also this formula is wrong for sun4i when calling get_wss() the function return 4 instead of 3.

Replace this with a simpler switch case.

Also drop the i2s params which is unused and return a simple int as returning an error code could be out of range for an s8 and there is no optim to return a s8 here.

Fixes: 619c15f7fac9 ("ASoC: sun4i-i2s: Change SR and WSS computation") Reviewed-by: Chen-Yu Tsai wens@csie.org Signed-off-by: Clément Péron peron.clem@gmail.com

---

sound/soc/sunxi/sun4i-i2s.c | 69 +++++++++++++++++++++++-------------- 1 file changed, 44 insertions(+), 25 deletions(-)

diff --git a/sound/soc/sunxi/sun4i-i2s.c b/sound/soc/sunxi/sun4i-i2s.c index 1f577dbc20a6..8e497fb3de09 100644 --- a/sound/soc/sunxi/sun4i-i2s.c +++ b/sound/soc/sunxi/sun4i-i2s.c @@ -175,8 +175,8 @@ struct sun4i_i2s_quirks { unsigned int num_mclk_dividers;

  unsigned long (*get_bclk_parent_rate)(const struct sun4i_i2s *);

• s8      (*get_sr)(const struct sun4i_i2s *, int);
  

• s8      (*get_wss)(const struct sun4i_i2s *, int);
  

• int     (*get_sr)(unsigned int width);
  

• int     (*get_wss)(unsigned int width);
  int     (*set_chan_cfg)(const struct sun4i_i2s *i2s,
                          unsigned int channels,  unsigned int slots,
                          unsigned int slot_width);
  

@@ -381,37 +381,56 @@ static int sun4i_i2s_set_clk_rate(struct snd_soc_dai *dai, return 0; }

-static s8 sun4i_i2s_get_sr(const struct sun4i_i2s *i2s, int width) +static int sun4i_i2s_get_sr(unsigned int width) {

• if (width < 16 || width > 24)
  

•         return -EINVAL;
  

• if (width % 4)
  

•         return -EINVAL;
  

• switch (width) {
  

• case 16:
  

•         return 0x0;
  

• case 20:
  

•         return 0x1;
  

• case 24:
  

•         return 0x2;
  

• }
  
  

• return (width - 16) / 4;
  

• return -EINVAL;
  

}

-static s8 sun4i_i2s_get_wss(const struct sun4i_i2s *i2s, int width) +static int sun4i_i2s_get_wss(unsigned int width) {

• if (width < 16 || width > 32)
  

•         return -EINVAL;
  

• if (width % 4)
  

•         return -EINVAL;
  

• switch (width) {
  

• case 16:
  

•         return 0x0;
  

• case 20:
  

•         return 0x1;
  

• case 24:
  

•         return 0x2;
  

• case 32:
  

•         return 0x3;
  

• }
  

Like I said in the previous version, I'm not really sure why we need to use the hexadecimal representation here?

I'm not sure if there is a convention when to use hexa or when not to use it.

But these figures are taken from the User Manual where register descriptions are written in Base 2 and default values are written in Base 16.

It's easier to read them and check that the code follows the documentation, no ?

Indeed with 2 bits this doesn't change anything. Do you want me to change them in decimal ?

Clement

Maxime