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

Commit 46f20872 authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mark Brown
Browse files

ASoC: rt5677: 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 5f7201d5

sound/soc/codecs/rt5677.c

+12 −11
Original line number Diff line number Diff line
@@ -895,7 +895,7 @@ static const struct snd_kcontrol_new rt5677_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 rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec);

	int idx = rl6231_calc_dmic_clk(rt5677->sysclk);
@@ -910,7 +910,8 @@ 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 rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(source->codec);

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

	struct rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec);

	unsigned int val;



	regmap_read(rt5677->regmap, RT5677_GLB_CLK1, &val);
@@ -924,7 +925,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 = source->codec;

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

	struct rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec);

	unsigned int reg, shift, val;
@@ -2125,7 +2126,7 @@ static const struct snd_kcontrol_new rt5677_if2_dac7_tdm_sel_mux = 
static int rt5677_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);

	struct rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec);



	switch (event) {
@@ -2149,7 +2150,7 @@ static int rt5677_bst1_event(struct snd_soc_dapm_widget *w, 
static int rt5677_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);

	struct rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec);



	switch (event) {
@@ -2173,7 +2174,7 @@ static int rt5677_bst2_event(struct snd_soc_dapm_widget *w, 
static int rt5677_set_pll1_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 rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec);



	switch (event) {
@@ -2191,7 +2192,7 @@ static int rt5677_set_pll1_event(struct snd_soc_dapm_widget *w, 
static int rt5677_set_pll2_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 rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec);



	switch (event) {
@@ -2209,7 +2210,7 @@ static int rt5677_set_pll2_event(struct snd_soc_dapm_widget *w, 
static int rt5677_set_micbias1_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 rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec);



	switch (event) {
@@ -2236,7 +2237,7 @@ static int rt5677_set_micbias1_event(struct snd_soc_dapm_widget *w, 
static int rt5677_if1_adc_tdm_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 rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec);

	unsigned int value;
@@ -2259,7 +2260,7 @@ static int rt5677_if1_adc_tdm_event(struct snd_soc_dapm_widget *w, 
static int rt5677_if2_adc_tdm_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 rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec);

	unsigned int value;
@@ -2282,7 +2283,7 @@ static int rt5677_if2_adc_tdm_event(struct snd_soc_dapm_widget *w, 
static int rt5677_vref_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 rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec);



	switch (event) {