ASoC: codecs: rename to snd_soc_component_read()

[sfrench/cifs-2.6.git] / sound / soc / codecs / arizona.c

diff --git a/sound/soc/codecs/arizona.c b/sound/soc/codecs/arizona.c
index 9716c9624a8912e9c83197e34872a11f3029a0e3..1228f2de02975cadb757c3c92c94119c1b612572 100644 (file)
--- a/sound/soc/codecs/arizona.c
+++ b/sound/soc/codecs/arizona.c
@@ -87,7 +87,7 @@ static int arizona_spk_ev(struct snd_soc_dapm_widget *w,
 
        switch (event) {
        case SND_SOC_DAPM_POST_PMU:
-               val = snd_soc_component_read32(component,
+               val = snd_soc_component_read(component,
                                               ARIZONA_INTERRUPT_RAW_STATUS_3);
                if (val & ARIZONA_SPK_OVERHEAT_STS) {
                        dev_crit(arizona->dev,
@@ -897,7 +897,7 @@ static void arizona_in_set_vu(struct snd_soc_component *component, int ena)
 bool arizona_input_analog(struct snd_soc_component *component, int shift)
 {
        unsigned int reg = ARIZONA_IN1L_CONTROL + ((shift / 2) * 8);
-       unsigned int val = snd_soc_component_read32(component, reg);
+       unsigned int val = snd_soc_component_read(component, reg);
 
        return !(val & ARIZONA_IN1_MODE_MASK);
 }
@@ -937,7 +937,7 @@ int arizona_in_ev(struct snd_soc_dapm_widget *w, struct snd_kcontrol *kcontrol,
                break;
        case SND_SOC_DAPM_POST_PMD:
                /* Disable volume updates if no inputs are enabled */
-               reg = snd_soc_component_read32(component, ARIZONA_INPUT_ENABLES);
+               reg = snd_soc_component_read(component, ARIZONA_INPUT_ENABLES);
                if (reg == 0)
                        arizona_in_set_vu(component, 0);
                break;
@@ -1755,15 +1755,15 @@ static bool arizona_aif_cfg_changed(struct snd_soc_component *component,
 {
        int val;
 
-       val = snd_soc_component_read32(component, base + ARIZONA_AIF_BCLK_CTRL);
+       val = snd_soc_component_read(component, base + ARIZONA_AIF_BCLK_CTRL);
        if (bclk != (val & ARIZONA_AIF1_BCLK_FREQ_MASK))
                return true;
 
-       val = snd_soc_component_read32(component, base + ARIZONA_AIF_TX_BCLK_RATE);
+       val = snd_soc_component_read(component, base + ARIZONA_AIF_TX_BCLK_RATE);
        if (lrclk != (val & ARIZONA_AIF1TX_BCPF_MASK))
                return true;
 
-       val = snd_soc_component_read32(component, base + ARIZONA_AIF_FRAME_CTRL_1);
+       val = snd_soc_component_read(component, base + ARIZONA_AIF_FRAME_CTRL_1);
        if (frame != (val & (ARIZONA_AIF1TX_WL_MASK |
                             ARIZONA_AIF1TX_SLOT_LEN_MASK)))
                return true;
@@ -1813,7 +1813,7 @@ static int arizona_hw_params(struct snd_pcm_substream *substream,
        }
 
        /* Force multiple of 2 channels for I2S mode */
-       val = snd_soc_component_read32(component, base + ARIZONA_AIF_FORMAT);
+       val = snd_soc_component_read(component, base + ARIZONA_AIF_FORMAT);
        val &= ARIZONA_AIF1_FMT_MASK;
        if ((channels & 1) && (val == ARIZONA_FMT_I2S_MODE)) {
                arizona_aif_dbg(dai, "Forcing stereo mode\n");
@@ -1845,9 +1845,9 @@ static int arizona_hw_params(struct snd_pcm_substream *substream,
 
        if (reconfig) {
                /* Save AIF TX/RX state */
-               aif_tx_state = snd_soc_component_read32(component,
+               aif_tx_state = snd_soc_component_read(component,
                                            base + ARIZONA_AIF_TX_ENABLES);
-               aif_rx_state = snd_soc_component_read32(component,
+               aif_rx_state = snd_soc_component_read(component,
                                            base + ARIZONA_AIF_RX_ENABLES);
                /* Disable AIF TX/RX before reconfiguring it */
                regmap_update_bits_async(arizona->regmap,