Unverified Commit 05f38281 authored by Daniel Mack's avatar Daniel Mack Committed by Mark Brown
Browse files

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: default avatarDaniel Mack <daniel@zonque.org>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 737e370a

sound/soc/pxa/pxa-ssp.c

+2 −4
Original line number Diff line number Diff line
@@ -217,7 +217,6 @@ 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);
@@ -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);