Skip to content

Commit 39dfdf0

Browse files
AxelLinbroonie
authored andcommitted
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: Axel Lin <axel.lin@ingics.com> Reviewed-by: Daniel Baluta <daniel.baluta@nxp.com> Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent c0ea089 commit 39dfdf0

File tree

1 file changed

+5
-12
lines changed

1 file changed

+5
-12
lines changed

sound/soc/codecs/ak5558.c

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -130,16 +130,12 @@ static int ak5558_hw_params(struct snd_pcm_substream *substream,
130130
u8 bits;
131131
int pcm_width = max(params_physical_width(params), ak5558->slot_width);
132132

133-
/* set master/slave audio interface */
134-
bits = snd_soc_component_read32(component, AK5558_02_CONTROL1);
135-
bits &= ~AK5558_BITS;
136-
137133
switch (pcm_width) {
138134
case 16:
139-
bits |= AK5558_DIF_24BIT_MODE;
135+
bits = AK5558_DIF_24BIT_MODE;
140136
break;
141137
case 32:
142-
bits |= AK5558_DIF_32BIT_MODE;
138+
bits = AK5558_DIF_32BIT_MODE;
143139
break;
144140
default:
145141
return -EINVAL;
@@ -168,18 +164,15 @@ static int ak5558_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt)
168164
}
169165

170166
/* set master/slave audio interface */
171-
format = snd_soc_component_read32(component, AK5558_02_CONTROL1);
172-
format &= ~AK5558_DIF;
173-
174167
switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) {
175168
case SND_SOC_DAIFMT_I2S:
176-
format |= AK5558_DIF_I2S_MODE;
169+
format = AK5558_DIF_I2S_MODE;
177170
break;
178171
case SND_SOC_DAIFMT_LEFT_J:
179-
format |= AK5558_DIF_MSB_MODE;
172+
format = AK5558_DIF_MSB_MODE;
180173
break;
181174
case SND_SOC_DAIFMT_DSP_B:
182-
format |= AK5558_DIF_MSB_MODE;
175+
format = AK5558_DIF_MSB_MODE;
183176
break;
184177
default:
185178
return -EINVAL;

0 commit comments

Comments
 (0)