diff options
| author | Daniel Mack | 2018-05-21 23:50:17 +0200 |
|---|---|---|
| committer | Mark Brown | 2018-05-22 12:57:17 +0200 |
| commit | 05f38281c5e5272ff1d350ed8762b08c4f6d10fc (patch) | |
| tree | 3d439ec9b5f0cb20fdd63a612bdc8ac9d4a5fbff /sound/soc/pxa/pxa-ssp.c | |
| parent | ASoC: pxa-ssp: allow more flexible setup order (diff) | |
| download | kernel-qcow2-linux-05f38281c5e5272ff1d350ed8762b08c4f6d10fc.tar.gz kernel-qcow2-linux-05f38281c5e5272ff1d350ed8762b08c4f6d10fc.tar.xz kernel-qcow2-linux-05f38281c5e5272ff1d350ed8762b08c4f6d10fc.zip | |
ASoC: pxa-ssp: simplify pxa_ssp_set_dai_sysclk()
There's no need to read the register again prior to writing it, we did
that in the beginning of the function.
Signed-off-by: Daniel Mack <daniel@zonque.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/pxa/pxa-ssp.c')
| -rw-r--r-- | sound/soc/pxa/pxa-ssp.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sound/soc/pxa/pxa-ssp.c b/sound/soc/pxa/pxa-ssp.c index ffddcf117eb8..6fc986080130 100644 --- a/sound/soc/pxa/pxa-ssp.c +++ b/sound/soc/pxa/pxa-ssp.c @@ -217,10 +217,9 @@ static int pxa_ssp_set_dai_sysclk(struct snd_soc_dai *cpu_dai, { struct ssp_priv *priv = snd_soc_dai_get_drvdata(cpu_dai); struct ssp_device *ssp = priv->ssp; - int val; u32 sscr0 = pxa_ssp_read_reg(ssp, SSCR0) & - ~(SSCR0_ECS | SSCR0_NCS | SSCR0_MOD | SSCR0_ACS); + ~(SSCR0_ECS | SSCR0_NCS | SSCR0_MOD | SSCR0_ACS); dev_dbg(&ssp->pdev->dev, "pxa_ssp_set_dai_sysclk id: %d, clk_id %d, freq %u\n", @@ -258,8 +257,7 @@ static int pxa_ssp_set_dai_sysclk(struct snd_soc_dai *cpu_dai, * on PXA2xx. On PXA3xx it must be enabled when doing so. */ if (ssp->type != PXA3xx_SSP) clk_disable_unprepare(ssp->clk); - val = pxa_ssp_read_reg(ssp, SSCR0) | sscr0; - pxa_ssp_write_reg(ssp, SSCR0, val); + pxa_ssp_write_reg(ssp, SSCR0, sscr0); if (ssp->type != PXA3xx_SSP) clk_prepare_enable(ssp->clk); |