Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8eee1468 authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mark Brown
Browse files

ASoC: rt5670: Replace w->codec snd_soc_dapm_to_codec(w->dapm) 



The codec field of the snd_soc_widget struct is eventually going to be
removed, use snd_soc_dapm_to_codec(w->dapm) instead.

Signed-off-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 30c173ed

sound/soc/codecs/rt5670.c

+9 −7
Original line number Diff line number Diff line
@@ -498,7 +498,7 @@ static const struct snd_kcontrol_new rt5670_snd_controls[] = { 
static int set_dmic_clk(struct snd_soc_dapm_widget *w,

	struct snd_kcontrol *kcontrol, int event)

{

	struct snd_soc_codec *codec = w->codec;

	struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);

	struct rt5670_priv *rt5670 = snd_soc_codec_get_drvdata(codec);

	int idx = -EINVAL;
@@ -515,9 +515,10 @@ static int set_dmic_clk(struct snd_soc_dapm_widget *w, 
static int is_sys_clk_from_pll(struct snd_soc_dapm_widget *source,

			 struct snd_soc_dapm_widget *sink)

{

	struct snd_soc_codec *codec = snd_soc_dapm_to_codec(source->dapm);

	unsigned int val;



	val = snd_soc_read(source->codec, RT5670_GLB_CLK);

	val = snd_soc_read(codec, RT5670_GLB_CLK);

	val &= RT5670_SCLK_SRC_MASK;

	if (val == RT5670_SCLK_SRC_PLL1)

		return 1;
@@ -528,6 +529,7 @@ static int is_sys_clk_from_pll(struct snd_soc_dapm_widget *source, 
static int is_using_asrc(struct snd_soc_dapm_widget *source,

			 struct snd_soc_dapm_widget *sink)

{

	struct snd_soc_codec *codec = snd_soc_dapm_to_codec(source->dapm);

	unsigned int reg, shift, val;



	switch (source->shift) {
@@ -563,7 +565,7 @@ static int is_using_asrc(struct snd_soc_dapm_widget *source, 
		return 0;

	}



	val = (snd_soc_read(source->codec, reg) >> shift) & 0xf;

	val = (snd_soc_read(codec, reg) >> shift) & 0xf;

	switch (val) {

	case 1:

	case 2:
@@ -1146,7 +1148,7 @@ static const struct snd_kcontrol_new rt5670_vad_adc_mux = 
static int rt5670_hp_power_event(struct snd_soc_dapm_widget *w,

			   struct snd_kcontrol *kcontrol, int event)

{

	struct snd_soc_codec *codec = w->codec;

	struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);

	struct rt5670_priv *rt5670 = snd_soc_codec_get_drvdata(codec);



	switch (event) {
@@ -1182,7 +1184,7 @@ static int rt5670_hp_power_event(struct snd_soc_dapm_widget *w, 
static int rt5670_hp_event(struct snd_soc_dapm_widget *w,

	struct snd_kcontrol *kcontrol, int event)

{

	struct snd_soc_codec *codec = w->codec;

	struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);

	struct rt5670_priv *rt5670 = snd_soc_codec_get_drvdata(codec);



	switch (event) {
@@ -1232,7 +1234,7 @@ static int rt5670_hp_event(struct snd_soc_dapm_widget *w, 
static int rt5670_bst1_event(struct snd_soc_dapm_widget *w,

	struct snd_kcontrol *kcontrol, int event)

{

	struct snd_soc_codec *codec = w->codec;

	struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);



	switch (event) {

	case SND_SOC_DAPM_POST_PMU:
@@ -1255,7 +1257,7 @@ static int rt5670_bst1_event(struct snd_soc_dapm_widget *w, 
static int rt5670_bst2_event(struct snd_soc_dapm_widget *w,

	struct snd_kcontrol *kcontrol, int event)

{

	struct snd_soc_codec *codec = w->codec;

	struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);



	switch (event) {

	case SND_SOC_DAPM_POST_PMU: