ASoC: codecs: cs*: rename to snd_soc_component_read()

We need to use snd_soc_component_read()
instead of     snd_soc_component_read32()

This patch renames _read32() to _read()

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87a7134mc4.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/cs4270.c b/sound/soc/codecs/cs4270.c
index 8a02791..3e8dabc 100644 (file)
--- a/sound/soc/codecs/cs4270.c
+++ b/sound/soc/codecs/cs4270.c
@@ -355,7 +355,7 @@ static int cs4270_hw_params(struct snd_pcm_substream *substream,
 
        /* Set the sample rate */
 
-       reg = snd_soc_component_read32(component, CS4270_MODE);
+       reg = snd_soc_component_read(component, CS4270_MODE);
        reg &= ~(CS4270_MODE_SPEED_MASK | CS4270_MODE_DIV_MASK);
        reg |= cs4270_mode_ratios[i].mclk;
 
@@ -372,7 +372,7 @@ static int cs4270_hw_params(struct snd_pcm_substream *substream,
 
        /* Set the DAI format */
 
-       reg = snd_soc_component_read32(component, CS4270_FORMAT);
+       reg = snd_soc_component_read(component, CS4270_FORMAT);
        reg &= ~(CS4270_FORMAT_DAC_MASK | CS4270_FORMAT_ADC_MASK);
 
        switch (cs4270->mode) {
@@ -412,7 +412,7 @@ static int cs4270_dai_mute(struct snd_soc_dai *dai, int mute)
        struct cs4270_private *cs4270 = snd_soc_component_get_drvdata(component);
        int reg6;
 
-       reg6 = snd_soc_component_read32(component, CS4270_MUTE);
+       reg6 = snd_soc_component_read(component, CS4270_MUTE);
 
        if (mute)
                reg6 |= CS4270_MUTE_DAC_A | CS4270_MUTE_DAC_B;
@@ -567,7 +567,7 @@ static int cs4270_soc_suspend(struct snd_soc_component *component)
        struct cs4270_private *cs4270 = snd_soc_component_get_drvdata(component);
        int reg, ret;
 
-       reg = snd_soc_component_read32(component, CS4270_PWRCTL) | CS4270_PWRCTL_PDN_ALL;
+       reg = snd_soc_component_read(component, CS4270_PWRCTL) | CS4270_PWRCTL_PDN_ALL;
        if (reg < 0)
                return reg;
 
@@ -599,7 +599,7 @@ static int cs4270_soc_resume(struct snd_soc_component *component)
        regcache_sync(cs4270->regmap);
 
        /* ... then disable the power-down bits */
-       reg = snd_soc_component_read32(component, CS4270_PWRCTL);
+       reg = snd_soc_component_read(component, CS4270_PWRCTL);
        reg &= ~CS4270_PWRCTL_PDN_ALL;
 
        return snd_soc_component_write(component, CS4270_PWRCTL, reg);

diff --git a/sound/soc/codecs/cs42l42.c b/sound/soc/codecs/cs42l42.c
index 5125bb9..3bc2fa2 100644 (file)
--- a/sound/soc/codecs/cs42l42.c
+++ b/sound/soc/codecs/cs42l42.c
@@ -877,7 +877,7 @@ static int cs42l42_digital_mute(struct snd_soc_dai *dai, int mute)
                                CS42L42_PLL_START_MASK,
                                1 << CS42L42_PLL_START_SHIFT);
                /* Read the headphone load */
-               regval = snd_soc_component_read32(component, CS42L42_LOAD_DET_RCSTAT);
+               regval = snd_soc_component_read(component, CS42L42_LOAD_DET_RCSTAT);
                if (((regval & CS42L42_RLA_STAT_MASK) >>
                        CS42L42_RLA_STAT_SHIFT) == CS42L42_RLA_STAT_15_OHM) {
                        fullScaleVol = CS42L42_HP_FULL_SCALE_VOL_MASK;

diff --git a/sound/soc/codecs/cs42l51.c b/sound/soc/codecs/cs42l51.c
index e47758e..dde9812 100644 (file)
--- a/sound/soc/codecs/cs42l51.c
+++ b/sound/soc/codecs/cs42l51.c
@@ -61,7 +61,7 @@ static int cs42l51_get_chan_mix(struct snd_kcontrol *kcontrol,
                        struct snd_ctl_elem_value *ucontrol)
 {
        struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
-       unsigned long value = snd_soc_component_read32(component, CS42L51_PCM_MIXER)&3;
+       unsigned long value = snd_soc_component_read(component, CS42L51_PCM_MIXER)&3;
 
        switch (value) {
        default:
@@ -407,8 +407,8 @@ static int cs42l51_hw_params(struct snd_pcm_substream *substream,
                return -EINVAL;
        }
 
-       intf_ctl = snd_soc_component_read32(component, CS42L51_INTF_CTL);
-       power_ctl = snd_soc_component_read32(component, CS42L51_MIC_POWER_CTL);
+       intf_ctl = snd_soc_component_read(component, CS42L51_INTF_CTL);
+       power_ctl = snd_soc_component_read(component, CS42L51_MIC_POWER_CTL);
 
        intf_ctl &= ~(CS42L51_INTF_CTL_MASTER | CS42L51_INTF_CTL_ADC_I2S
                        | CS42L51_INTF_CTL_DAC_FORMAT(7));
@@ -490,7 +490,7 @@ static int cs42l51_dai_mute(struct snd_soc_dai *dai, int mute)
        int reg;
        int mask = CS42L51_DAC_OUT_CTL_DACA_MUTE|CS42L51_DAC_OUT_CTL_DACB_MUTE;
 
-       reg = snd_soc_component_read32(component, CS42L51_DAC_OUT_CTL);
+       reg = snd_soc_component_read(component, CS42L51_DAC_OUT_CTL);
 
        if (mute)
                reg |= mask;

diff --git a/sound/soc/codecs/cs42l73.c b/sound/soc/codecs/cs42l73.c
index 36089f8..988ca7e 100644 (file)
--- a/sound/soc/codecs/cs42l73.c
+++ b/sound/soc/codecs/cs42l73.c
@@ -938,8 +938,8 @@ static int cs42l73_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt)
        unsigned int inv, format;
        u8 spc, mmcc;
 
-       spc = snd_soc_component_read32(component, CS42L73_SPC(id));
-       mmcc = snd_soc_component_read32(component, CS42L73_MMCC(id));
+       spc = snd_soc_component_read(component, CS42L73_SPC(id));
+       mmcc = snd_soc_component_read(component, CS42L73_MMCC(id));
 
        switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
        case SND_SOC_DAIFMT_CBM_CFM: