Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit ff4adb09 authored by Nicolin Chen's avatar Nicolin Chen Committed by Mark Brown
Browse files

ASoC: fsl_ssi: Rename scr_val to scr 



Simplify the variable name. This reduces one over-80-character line.

Signed-off-by: default avatarNicolin Chen <nicoleotsuka@gmail.com>
Tested-by: default avatarMaciej S. Szmigiero <mail@maciej.szmigiero.name>
Reviewed-by: default avatarMaciej S. Szmigiero <mail@maciej.szmigiero.name>
Acked-by: default avatarTimur Tabi <timur@tabi.org>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 0c884bed

sound/soc/fsl/fsl_ssi.c

+6 −6
Original line number Diff line number Diff line
@@ -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