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

Commit 76f17f18 authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mark Brown
Browse files

ASoC: rt286: 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 0bb043f5

sound/soc/codecs/rt286.c

+8 −7
Original line number Original line Diff line number Diff line
@@ -403,7 +403,8 @@ EXPORT_SYMBOL_GPL(rt286_mic_detect); 
static int is_mclk_mode(struct snd_soc_dapm_widget *source,

static int is_mclk_mode(struct snd_soc_dapm_widget *source,

			 struct snd_soc_dapm_widget *sink)

			 struct snd_soc_dapm_widget *sink)

{

{

	struct rt286_priv *rt286 = snd_soc_codec_get_drvdata(source->codec);

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

	struct rt286_priv *rt286 = snd_soc_codec_get_drvdata(codec);





	if (rt286->clk_id == RT286_SCLK_S_MCLK)

	if (rt286->clk_id == RT286_SCLK_S_MCLK)

		return 1;

		return 1;
@@ -500,7 +501,7 @@ SOC_DAPM_ENUM("SPO source", rt286_spo_enum); 
static int rt286_spk_event(struct snd_soc_dapm_widget *w,

static int rt286_spk_event(struct snd_soc_dapm_widget *w,

			    struct snd_kcontrol *kcontrol, int event)

			    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) {

	switch (event) {

	case SND_SOC_DAPM_POST_PMU:

	case SND_SOC_DAPM_POST_PMU:
@@ -522,7 +523,7 @@ static int rt286_spk_event(struct snd_soc_dapm_widget *w, 
static int rt286_set_dmic1_event(struct snd_soc_dapm_widget *w,

static int rt286_set_dmic1_event(struct snd_soc_dapm_widget *w,

				  struct snd_kcontrol *kcontrol, int event)

				  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) {

	switch (event) {

	case SND_SOC_DAPM_POST_PMU:

	case SND_SOC_DAPM_POST_PMU:
@@ -541,7 +542,7 @@ static int rt286_set_dmic1_event(struct snd_soc_dapm_widget *w, 
static int rt286_adc_event(struct snd_soc_dapm_widget *w,

static int rt286_adc_event(struct snd_soc_dapm_widget *w,

			     struct snd_kcontrol *kcontrol, int event)

			     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);

	unsigned int nid;

	unsigned int nid;





	nid = (w->reg >> 20) & 0xff;

	nid = (w->reg >> 20) & 0xff;
@@ -567,7 +568,7 @@ static int rt286_adc_event(struct snd_soc_dapm_widget *w, 
static int rt286_vref_event(struct snd_soc_dapm_widget *w,

static int rt286_vref_event(struct snd_soc_dapm_widget *w,

			     struct snd_kcontrol *kcontrol, int event)

			     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) {

	switch (event) {

	case SND_SOC_DAPM_PRE_PMU:

	case SND_SOC_DAPM_PRE_PMU:
@@ -585,7 +586,7 @@ static int rt286_vref_event(struct snd_soc_dapm_widget *w, 
static int rt286_ldo2_event(struct snd_soc_dapm_widget *w,

static int rt286_ldo2_event(struct snd_soc_dapm_widget *w,

			     struct snd_kcontrol *kcontrol, int event)

			     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) {

	switch (event) {

	case SND_SOC_DAPM_POST_PMU:

	case SND_SOC_DAPM_POST_PMU:
@@ -604,7 +605,7 @@ static int rt286_ldo2_event(struct snd_soc_dapm_widget *w, 
static int rt286_mic1_event(struct snd_soc_dapm_widget *w,

static int rt286_mic1_event(struct snd_soc_dapm_widget *w,

			     struct snd_kcontrol *kcontrol, int event)

			     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) {

	switch (event) {

	case SND_SOC_DAPM_PRE_PMU:

	case SND_SOC_DAPM_PRE_PMU: