mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-29 22:02:02 +00:00
Code Issues Releases Wiki Activity

ASoC: fsl_sai: Use better variable names

Browse source 
"ret" is normally used as a variable name for return values. In
fsl_sai_set_bclk() it stores the difference between the desired rate and
the rate we can archieve, so rename it to "diff". Also rename "savesub"
to "bestdiff" as that stores the best difference we have found.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Link: https://lore.kernel.org/r/20220302083428.3804687-6-s.hauer@pengutronix.de
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Sascha Hauer 2022-03-02 09:34:26 +01:00 committed by Mark Brown
parent 99c1e74f25
commit c56359f4f2
No known key found for this signature in database
GPG key ID: 24D68B725D5487D0
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
sound/soc/fsl/fsl_sai.c
View file

@ -343,11 +343,10 @@ static int fsl_sai_set_bclk(struct snd_soc_dai *dai, bool tx, u32 freq)
struct fsl_sai *sai = snd_soc_dai_get_drvdata(dai); struct fsl_sai *sai = snd_soc_dai_get_drvdata(dai);
unsigned int reg, ofs = sai->soc_data->reg_offset; unsigned int reg, ofs = sai->soc_data->reg_offset;
unsigned long clk_rate; unsigned long clk_rate;
u32 savediv = 0, ratio, savesub = freq; u32 savediv = 0, ratio, bestdiff = freq;
int adir = tx ? RX : TX; int adir = tx ? RX : TX;
int dir = tx ? TX : RX; int dir = tx ? TX : RX;
u32 id; u32 id;
int ret = 0;
/* Don't apply to consumer mode */ /* Don't apply to consumer mode */
if (sai->is_consumer_mode) if (sai->is_consumer_mode)
@ -361,19 +360,21 @@ static int fsl_sai_set_bclk(struct snd_soc_dai *dai, bool tx, u32 freq)
id = sai->soc_data->mclk0_is_mclk1 ? 1 : 0; id = sai->soc_data->mclk0_is_mclk1 ? 1 : 0;
for (; id < FSL_SAI_MCLK_MAX; id++) { for (; id < FSL_SAI_MCLK_MAX; id++) {
int diff;
clk_rate = clk_get_rate(sai->mclk_clk[id]); clk_rate = clk_get_rate(sai->mclk_clk[id]);
if (!clk_rate) if (!clk_rate)
continue; continue;
ratio = clk_rate / freq; ratio = clk_rate / freq;
ret = clk_rate - ratio * freq; diff = clk_rate - ratio * freq;
/* /*
* Drop the source that can not be * Drop the source that can not be
* divided into the required rate. * divided into the required rate.
*/ */
if (ret != 0 && clk_rate / ret < 1000) if (diff != 0 && clk_rate / diff < 1000)
continue; continue;
dev_dbg(dai->dev, dev_dbg(dai->dev,
@ -385,13 +386,13 @@ static int fsl_sai_set_bclk(struct snd_soc_dai *dai, bool tx, u32 freq)
else else
continue; continue;
if (ret < savesub) { if (diff < bestdiff) {
savediv = ratio; savediv = ratio;
sai->mclk_id[tx] = id; sai->mclk_id[tx] = id;
savesub = ret; bestdiff = diff;
} }
if (ret == 0) if (diff == 0)
break; break;
} }
@ -402,7 +403,7 @@ static int fsl_sai_set_bclk(struct snd_soc_dai *dai, bool tx, u32 freq)
} }
dev_dbg(dai->dev, "best fit: clock id=%d, div=%d, deviation =%d\n", dev_dbg(dai->dev, "best fit: clock id=%d, div=%d, deviation =%d\n",
sai->mclk_id[tx], savediv, savesub); sai->mclk_id[tx], savediv, bestdiff);
/* /*
* 1) For Asynchronous mode, we must set RCR2 register for capture, and * 1) For Asynchronous mode, we must set RCR2 register for capture, and