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

Unverified Commit 39dfdf00 authored by Axel Lin's avatar Axel Lin Committed by Mark Brown
Browse files

ASoC: ak5558: Remove redundant snd_soc_component_read32 calls 



snd_soc_component_update_bits() will only update the mask bits,
so remove the redundant snd_soc_component_read32().

Signed-off-by: default avatarAxel Lin <axel.lin@ingics.com>
Reviewed-by: default avatarDaniel Baluta <daniel.baluta@nxp.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent c0ea089d

sound/soc/codecs/ak5558.c

+5 −12
Original line number Diff line number Diff line
@@ -130,16 +130,12 @@ static int ak5558_hw_params(struct snd_pcm_substream *substream, 
	u8 bits;

	int pcm_width = max(params_physical_width(params), ak5558->slot_width);



	/* set master/slave audio interface */

	bits = snd_soc_component_read32(component, AK5558_02_CONTROL1);

	bits &= ~AK5558_BITS;



	switch (pcm_width) {

	case 16:

		bits |= AK5558_DIF_24BIT_MODE;

		bits = AK5558_DIF_24BIT_MODE;

		break;

	case 32:

		bits |= AK5558_DIF_32BIT_MODE;

		bits = AK5558_DIF_32BIT_MODE;

		break;

	default:

		return -EINVAL;
@@ -168,18 +164,15 @@ static int ak5558_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt) 
	}



	/* set master/slave audio interface */

	format = snd_soc_component_read32(component, AK5558_02_CONTROL1);

	format &= ~AK5558_DIF;



	switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) {

	case SND_SOC_DAIFMT_I2S:

		format |= AK5558_DIF_I2S_MODE;

		format = AK5558_DIF_I2S_MODE;

		break;

	case SND_SOC_DAIFMT_LEFT_J:

		format |= AK5558_DIF_MSB_MODE;

		format = AK5558_DIF_MSB_MODE;

		break;

	case SND_SOC_DAIFMT_DSP_B:

		format |= AK5558_DIF_MSB_MODE;

		format = AK5558_DIF_MSB_MODE;

		break;

	default:

		return -EINVAL;