Skip to content

Commit

Permalink
ASoC: fsl_ssi: Rename scr_val to scr
Browse files Browse the repository at this point in the history
Simplify the variable name. This reduces one over-80-character line.

Signed-off-by: Nicolin Chen <nicoleotsuka@gmail.com>
Tested-by: Maciej S. Szmigiero <mail@maciej.szmigiero.name>
Reviewed-by: Maciej S. Szmigiero <mail@maciej.szmigiero.name>
Acked-by: Timur Tabi <timur@tabi.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
  • Loading branch information
Nicolin Chen authored and Mark Brown committed Dec 19, 2017
1 parent 0c884be commit ff4adb0
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions sound/soc/fsl/fsl_ssi.c
Original file line number Diff line number Diff line change
@@ -451,12 +451,12 @@ static void fsl_ssi_config(struct fsl_ssi *ssi, bool enable,
struct regmap *regs = ssi->regs;
struct fsl_ssi_reg_val *avals;
int nr_active_streams;
u32 scr_val;
u32 scr;
int keep_active;

regmap_read(regs, REG_SSI_SCR, &scr_val);
regmap_read(regs, REG_SSI_SCR, &scr);

nr_active_streams = !!(scr_val & SSI_SCR_TE) + !!(scr_val & SSI_SCR_RE);
nr_active_streams = !!(scr & SSI_SCR_TE) + !!(scr & SSI_SCR_RE);

if (nr_active_streams - 1 > 0)
keep_active = 1;
@@ -810,11 +810,11 @@ static int fsl_ssi_hw_params(struct snd_pcm_substream *substream,
unsigned int sample_size = params_width(hw_params);
u32 wl = SSI_SxCCR_WL(sample_size);
int ret;
u32 scr_val;
u32 scr;
int enabled;

regmap_read(regs, REG_SSI_SCR, &scr_val);
enabled = scr_val & SSI_SCR_SSIEN;
regmap_read(regs, REG_SSI_SCR, &scr);
enabled = scr & SSI_SCR_SSIEN;

/*
* SSI is properly configured if it is enabled and running in

0 comments on commit ff4adb0

Please sign in to comment.