ASoC: da732x: Replace hw_read usage with snd_soc_read()
Subsystems (3)
Mark Brown
maintainerPATCH 1/1 ASoC: da732x: Replace hw_read usage with snd_soc_read()
From: Mark Brown <[email protected]>
Pre-merge code was using direct hw_read() calls as an out of framework way of doing volatile register I/O when not using regmap. This has never functioned correctly in mainline due to the regmap conversion, the hw_read() implementation still does caching. In order to facilitate removal of the subsystem level I/O code convert to use snd_soc_read(), there should be no functional impact.
--- sound/soc/codecs/da732x.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
sound/soc/codecs/da732x.c +8 -8
@@ -1297,9 +1297,9 @@ static void da732x_dac_offset_adjust(struct snd_soc_codec *codec)msleep (DA732X_WAIT_FOR_STABILIZATION );/* Check DAC offset sign */ - sign[DA732X_HPL_DAC ] = (codec->hw_read (codec,DA732X_REG_HPL_DAC_OFF_CNTL ) & + sign[DA732X_HPL_DAC ] =snd_soc_read (codec,DA732X_REG_HPL_DAC_OFF_CNTL ) & DA732X_HP_DAC_OFF_CNTL_COMPO); - sign[DA732X_HPR_DAC ] = (codec->hw_read (codec,DA732X_REG_HPR_DAC_OFF_CNTL ) & + sign[DA732X_HPR_DAC ] =snd_soc_read (codec,DA732X_REG_HPR_DAC_OFF_CNTL ) & DA732X_HP_DAC_OFF_CNTL_COMPO);/* Binary search DAC offset values (both channels at once) */
@@ -1316,10 +1316,10 @@ static void da732x_dac_offset_adjust(struct snd_soc_codec *codec)msleep (DA732X_WAIT_FOR_STABILIZATION ); -if ((codec->hw_read (codec,DA732X_REG_HPL_DAC_OFF_CNTL ) & +if ((snd_soc_read (codec,DA732X_REG_HPL_DAC_OFF_CNTL ) &DA732X_HP_DAC_OFF_CNTL_COMPO ) ^ sign[DA732X_HPL_DAC ]) offset[DA732X_HPL_DAC ] &= ~step; -if ((codec->hw_read (codec,DA732X_REG_HPR_DAC_OFF_CNTL ) & +if ((snd_soc_read (codec,DA732X_REG_HPR_DAC_OFF_CNTL ) &DA732X_HP_DAC_OFF_CNTL_COMPO ) ^ sign[DA732X_HPR_DAC ]) offset[DA732X_HPR_DAC ] &= ~step;
@@ -1360,9 +1360,9 @@ static void da732x_output_offset_adjust(struct snd_soc_codec *codec)msleep (DA732X_WAIT_FOR_STABILIZATION );/* Check output offset sign */ - sign[DA732X_HPL_AMP ] = codec->hw_read (codec,DA732X_REG_HPL ) & + sign[DA732X_HPL_AMP ] =snd_soc_read (codec,DA732X_REG_HPL ) &DA732X_HP_OUT_COMPO ; - sign[DA732X_HPR_AMP ] = codec->hw_read (codec,DA732X_REG_HPR ) & + sign[DA732X_HPR_AMP ] =snd_soc_read (codec,DA732X_REG_HPR ) &DA732X_HP_OUT_COMPO ; snd_soc_write(codec, DA732X_REG_HPL, DA732X_HP_OUT_COMP |
@@ -1383,10 +1383,10 @@ static void da732x_output_offset_adjust(struct snd_soc_codec *codec)msleep (DA732X_WAIT_FOR_STABILIZATION ); -if ((codec->hw_read (codec,DA732X_REG_HPL ) & +if ((snd_soc_read (codec,DA732X_REG_HPL ) &DA732X_HP_OUT_COMPO ) ^ sign[DA732X_HPL_AMP ]) offset[DA732X_HPL_AMP ] &= ~step; -if ((codec->hw_read (codec,DA732X_REG_HPR ) & +if ((snd_soc_read (codec,DA732X_REG_HPR ) &DA732X_HP_OUT_COMPO ) ^ sign[DA732X_HPR_AMP ]) offset[DA732X_HPR_AMP ] &= ~step;
Signature · 1 line
1.9.0
Quoted 10 lines · Mark Brown
From: Mark Brown <[email protected]>
Pre-merge code was using direct
hw_read()calls as an out of framework way of doing volatile register I/O when not using regmap. This has never functioned correctly in mainline due to the regmap conversion, thehw_read()implementation still does caching. In order to facilitate removal of the subsystem level I/O code convert to usesnd_soc_read(), there should be no functional impact.Signed-off-by Mark Brown <[email protected]>