Unverified Commit e896c1ed authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: codecs: alc*: 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: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87ftav4md9.wl-kuninori.morimoto.gx@renesas.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent a6f80d99

sound/soc/codecs/alc5623.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -534,7 +534,7 @@ static int alc5623_set_dai_pll(struct snd_soc_dai *codec_dai, int pll_id, 
				0);

				0);





	/* pll is not used in slave mode */

	/* pll is not used in slave mode */

	reg = snd_soc_component_read32(component, ALC5623_DAI_CONTROL);

	reg = snd_soc_component_read(component, ALC5623_DAI_CONTROL);

	if (reg & ALC5623_DAI_SDP_SLAVE_MODE)

	if (reg & ALC5623_DAI_SDP_SLAVE_MODE)

		return 0;

		return 0;
@@ -701,7 +701,7 @@ static int alc5623_pcm_hw_params(struct snd_pcm_substream *substream, 
	int coeff, rate;

	int coeff, rate;

	u16 iface;

	u16 iface;





	iface = snd_soc_component_read32(component, ALC5623_DAI_CONTROL);

	iface = snd_soc_component_read(component, ALC5623_DAI_CONTROL);

	iface &= ~ALC5623_DAI_I2S_DL_MASK;

	iface &= ~ALC5623_DAI_I2S_DL_MASK;





	/* bit size */

	/* bit size */
@@ -741,7 +741,7 @@ static int alc5623_mute(struct snd_soc_dai *dai, int mute) 
{

{

	struct snd_soc_component *component = dai->component;

	struct snd_soc_component *component = dai->component;

	u16 hp_mute = ALC5623_MISC_M_DAC_L_INPUT | ALC5623_MISC_M_DAC_R_INPUT;

	u16 hp_mute = ALC5623_MISC_M_DAC_L_INPUT | ALC5623_MISC_M_DAC_R_INPUT;

	u16 mute_reg = snd_soc_component_read32(component, ALC5623_MISC_CTRL) & ~hp_mute;

	u16 mute_reg = snd_soc_component_read(component, ALC5623_MISC_CTRL) & ~hp_mute;





	if (mute)

	if (mute)

		mute_reg |= hp_mute;

		mute_reg |= hp_mute;

sound/soc/codecs/alc5632.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -694,7 +694,7 @@ static int alc5632_set_dai_pll(struct snd_soc_dai *codec_dai, int pll_id, 
				0);

				0);





	/* pll is not used in slave mode */

	/* pll is not used in slave mode */

	reg = snd_soc_component_read32(component, ALC5632_DAI_CONTROL);

	reg = snd_soc_component_read(component, ALC5632_DAI_CONTROL);

	if (reg & ALC5632_DAI_SDP_SLAVE_MODE)

	if (reg & ALC5632_DAI_SDP_SLAVE_MODE)

		return 0;

		return 0;
@@ -871,7 +871,7 @@ static int alc5632_pcm_hw_params(struct snd_pcm_substream *substream, 
	int coeff, rate;

	int coeff, rate;

	u16 iface;

	u16 iface;





	iface = snd_soc_component_read32(component, ALC5632_DAI_CONTROL);

	iface = snd_soc_component_read(component, ALC5632_DAI_CONTROL);

	iface &= ~ALC5632_DAI_I2S_DL_MASK;

	iface &= ~ALC5632_DAI_I2S_DL_MASK;





	/* bit size */

	/* bit size */
@@ -907,7 +907,7 @@ static int alc5632_mute(struct snd_soc_dai *dai, int mute) 
	struct snd_soc_component *component = dai->component;

	struct snd_soc_component *component = dai->component;

	u16 hp_mute = ALC5632_MISC_HP_DEPOP_MUTE_L

	u16 hp_mute = ALC5632_MISC_HP_DEPOP_MUTE_L

						|ALC5632_MISC_HP_DEPOP_MUTE_R;

						|ALC5632_MISC_HP_DEPOP_MUTE_R;

	u16 mute_reg = snd_soc_component_read32(component, ALC5632_MISC_CTRL) & ~hp_mute;

	u16 mute_reg = snd_soc_component_read(component, ALC5632_MISC_CTRL) & ~hp_mute;





	if (mute)

	if (mute)

		mute_reg |= hp_mute;

		mute_reg |= hp_mute;