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

ASoC: codecs: ak*: 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/878sgn4mc0.wl-kuninori.morimoto.gx@renesas.com


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

sound/soc/codecs/ak4458.c

+1 −1
Original line number Diff line number Diff line
@@ -410,7 +410,7 @@ static int ak4458_set_dai_mute(struct snd_soc_dai *dai, int mute) 


	nfs = ak4458->fs;



	reg = snd_soc_component_read32(component, AK4458_0B_CONTROL7);

	reg = snd_soc_component_read(component, AK4458_0B_CONTROL7);

	ats = (reg & AK4458_ATS_MASK) >> AK4458_ATS_SHIFT;



	ndt = att_speed[ats] / (nfs / 1000);

sound/soc/codecs/ak4535.c

+2 −2
Original line number Diff line number Diff line
@@ -261,7 +261,7 @@ static int ak4535_hw_params(struct snd_pcm_substream *substream, 
{

	struct snd_soc_component *component = dai->component;

	struct ak4535_priv *ak4535 = snd_soc_component_get_drvdata(component);

	u8 mode2 = snd_soc_component_read32(component, AK4535_MODE2) & ~(0x3 << 5);

	u8 mode2 = snd_soc_component_read(component, AK4535_MODE2) & ~(0x3 << 5);

	int rate = params_rate(params), fs = 256;



	if (rate)
@@ -312,7 +312,7 @@ static int ak4535_set_dai_fmt(struct snd_soc_dai *codec_dai, 
static int ak4535_mute(struct snd_soc_dai *dai, int mute)

{

	struct snd_soc_component *component = dai->component;

	u16 mute_reg = snd_soc_component_read32(component, AK4535_DAC);

	u16 mute_reg = snd_soc_component_read(component, AK4535_DAC);

	if (!mute)

		snd_soc_component_write(component, AK4535_DAC, mute_reg & ~0x20);

	else

sound/soc/codecs/ak4671.c

+4 −4
Original line number Diff line number Diff line
@@ -425,7 +425,7 @@ static int ak4671_hw_params(struct snd_pcm_substream *substream, 
	struct snd_soc_component *component = dai->component;

	u8 fs;



	fs = snd_soc_component_read32(component, AK4671_PLL_MODE_SELECT0);

	fs = snd_soc_component_read(component, AK4671_PLL_MODE_SELECT0);

	fs &= ~AK4671_FS;



	switch (params_rate(params)) {
@@ -471,7 +471,7 @@ static int ak4671_set_dai_sysclk(struct snd_soc_dai *dai, int clk_id, 
	struct snd_soc_component *component = dai->component;

	u8 pll;



	pll = snd_soc_component_read32(component, AK4671_PLL_MODE_SELECT0);

	pll = snd_soc_component_read(component, AK4671_PLL_MODE_SELECT0);

	pll &= ~AK4671_PLL;



	switch (freq) {
@@ -518,7 +518,7 @@ static int ak4671_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt) 
	u8 format;



	/* set master/slave audio interface */

	mode = snd_soc_component_read32(component, AK4671_PLL_MODE_SELECT1);

	mode = snd_soc_component_read(component, AK4671_PLL_MODE_SELECT1);



	switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {

	case SND_SOC_DAIFMT_CBM_CFM:
@@ -532,7 +532,7 @@ static int ak4671_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt) 
	}



	/* interface format */

	format = snd_soc_component_read32(component, AK4671_FORMAT_SELECT);

	format = snd_soc_component_read(component, AK4671_FORMAT_SELECT);

	format &= ~AK4671_DIF;



	switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) {