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

Commit 30c173ed authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mark Brown
Browse files

ASoC: rt5651: 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 c5f596cb

sound/soc/codecs/rt5651.c

+10 −8
Original line number Diff line number Diff line
@@ -376,7 +376,7 @@ static const struct snd_kcontrol_new rt5651_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 rt5651_priv *rt5651 = snd_soc_codec_get_drvdata(codec);

	int idx = -EINVAL;
@@ -394,9 +394,10 @@ static int set_dmic_clk(struct snd_soc_dapm_widget *w, 
static int is_sysclk_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, RT5651_GLB_CLK);

	val = snd_soc_read(codec, RT5651_GLB_CLK);

	val &= RT5651_SCLK_SRC_MASK;

	if (val == RT5651_SCLK_SRC_PLL1)

		return 1;
@@ -731,7 +732,7 @@ static const struct snd_kcontrol_new rt5651_pdm_r_mux = 
static int rt5651_amp_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 rt5651_priv *rt5651 = snd_soc_codec_get_drvdata(codec);



	switch (event) {
@@ -769,7 +770,7 @@ static int rt5651_amp_power_event(struct snd_soc_dapm_widget *w, 
static int rt5651_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 rt5651_priv *rt5651 = snd_soc_codec_get_drvdata(codec);



	switch (event) {
@@ -813,7 +814,8 @@ static int rt5651_hp_event(struct snd_soc_dapm_widget *w, 
static int rt5651_hp_post_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 rt5651_priv *rt5651 = snd_soc_codec_get_drvdata(codec);



	switch (event) {
@@ -833,7 +835,7 @@ static int rt5651_hp_post_event(struct snd_soc_dapm_widget *w, 
static int rt5651_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:
@@ -856,7 +858,7 @@ static int rt5651_bst1_event(struct snd_soc_dapm_widget *w, 
static int rt5651_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:
@@ -879,7 +881,7 @@ static int rt5651_bst2_event(struct snd_soc_dapm_widget *w, 
static int rt5651_bst3_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: