diff options
| author | Nicolin Chen <nicoleotsuka@gmail.com> | 2018-02-12 14:03:25 -0800 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-02-21 12:31:00 +0000 |
| commit | 9c4f509a53cbcd968677c7f15c07260dd6c2276c (patch) | |
| tree | f16c1f6ba714e00b62a8b233a2b4c63e1a1c5e68 | |
| parent | 76f3845110d7d40eb60c12bc64cdfe431a985947 (diff) | |
| download | op-kernel-dev-9c4f509a53cbcd968677c7f15c07260dd6c2276c.zip op-kernel-dev-9c4f509a53cbcd968677c7f15c07260dd6c2276c.tar.gz | |
ASoC: fsl_ssi: Use ssi->streams instead of reading register
Since ssi->streams is being updated along with SCR register and
its SSIEN bit, it's simpler to use it instead.
Signed-off-by: Nicolin Chen <nicoleotsuka@gmail.com>
Tested-by: Caleb Crome <caleb@crome.org>
Tested-by: Maciej S. Szmigiero <mail@maciej.szmigiero.name>
Reviewed-by: Maciej S. Szmigiero <mail@maciej.szmigiero.name>
Signed-off-by: Mark Brown <broonie@kernel.org>
| -rw-r--r-- | sound/soc/fsl/fsl_ssi.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c index 5bc67ad..0823b08 100644 --- a/sound/soc/fsl/fsl_ssi.c +++ b/sound/soc/fsl/fsl_ssi.c @@ -803,11 +803,6 @@ 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; - int enabled; - - regmap_read(regs, REG_SSI_SCR, &scr); - enabled = scr & SSI_SCR_SSIEN; /* * SSI is properly configured if it is enabled and running in @@ -815,7 +810,7 @@ static int fsl_ssi_hw_params(struct snd_pcm_substream *substream, * that should set separate configurations for STCCR and SRCCR * despite running in the synchronous mode. */ - if (enabled && ssi->synchronous) + if (ssi->streams && ssi->synchronous) return 0; if (fsl_ssi_is_i2s_master(ssi)) { |
