diff options
Diffstat (limited to 'sound/soc/codecs/max98095.c')
-rw-r--r-- | sound/soc/codecs/max98095.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sound/soc/codecs/max98095.c b/sound/soc/codecs/max98095.c index 03f0536e6f61..5d4c621dbf99 100644 --- a/sound/soc/codecs/max98095.c +++ b/sound/soc/codecs/max98095.c | |||
@@ -612,7 +612,7 @@ static SOC_ENUM_SINGLE_DECL(max98095_dai3_dac_filter_enum, | |||
612 | static int max98095_mic1pre_set(struct snd_kcontrol *kcontrol, | 612 | static int max98095_mic1pre_set(struct snd_kcontrol *kcontrol, |
613 | struct snd_ctl_elem_value *ucontrol) | 613 | struct snd_ctl_elem_value *ucontrol) |
614 | { | 614 | { |
615 | struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); | 615 | struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); |
616 | struct max98095_priv *max98095 = snd_soc_codec_get_drvdata(codec); | 616 | struct max98095_priv *max98095 = snd_soc_codec_get_drvdata(codec); |
617 | unsigned int sel = ucontrol->value.integer.value[0]; | 617 | unsigned int sel = ucontrol->value.integer.value[0]; |
618 | 618 | ||
@@ -626,7 +626,7 @@ static int max98095_mic1pre_set(struct snd_kcontrol *kcontrol, | |||
626 | static int max98095_mic1pre_get(struct snd_kcontrol *kcontrol, | 626 | static int max98095_mic1pre_get(struct snd_kcontrol *kcontrol, |
627 | struct snd_ctl_elem_value *ucontrol) | 627 | struct snd_ctl_elem_value *ucontrol) |
628 | { | 628 | { |
629 | struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); | 629 | struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); |
630 | struct max98095_priv *max98095 = snd_soc_codec_get_drvdata(codec); | 630 | struct max98095_priv *max98095 = snd_soc_codec_get_drvdata(codec); |
631 | 631 | ||
632 | ucontrol->value.integer.value[0] = max98095->mic1pre; | 632 | ucontrol->value.integer.value[0] = max98095->mic1pre; |
@@ -636,7 +636,7 @@ static int max98095_mic1pre_get(struct snd_kcontrol *kcontrol, | |||
636 | static int max98095_mic2pre_set(struct snd_kcontrol *kcontrol, | 636 | static int max98095_mic2pre_set(struct snd_kcontrol *kcontrol, |
637 | struct snd_ctl_elem_value *ucontrol) | 637 | struct snd_ctl_elem_value *ucontrol) |
638 | { | 638 | { |
639 | struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); | 639 | struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); |
640 | struct max98095_priv *max98095 = snd_soc_codec_get_drvdata(codec); | 640 | struct max98095_priv *max98095 = snd_soc_codec_get_drvdata(codec); |
641 | unsigned int sel = ucontrol->value.integer.value[0]; | 641 | unsigned int sel = ucontrol->value.integer.value[0]; |
642 | 642 | ||
@@ -650,7 +650,7 @@ static int max98095_mic2pre_set(struct snd_kcontrol *kcontrol, | |||
650 | static int max98095_mic2pre_get(struct snd_kcontrol *kcontrol, | 650 | static int max98095_mic2pre_get(struct snd_kcontrol *kcontrol, |
651 | struct snd_ctl_elem_value *ucontrol) | 651 | struct snd_ctl_elem_value *ucontrol) |
652 | { | 652 | { |
653 | struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); | 653 | struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); |
654 | struct max98095_priv *max98095 = snd_soc_codec_get_drvdata(codec); | 654 | struct max98095_priv *max98095 = snd_soc_codec_get_drvdata(codec); |
655 | 655 | ||
656 | ucontrol->value.integer.value[0] = max98095->mic2pre; | 656 | ucontrol->value.integer.value[0] = max98095->mic2pre; |
@@ -1737,7 +1737,7 @@ static int max98095_get_eq_channel(const char *name) | |||
1737 | static int max98095_put_eq_enum(struct snd_kcontrol *kcontrol, | 1737 | static int max98095_put_eq_enum(struct snd_kcontrol *kcontrol, |
1738 | struct snd_ctl_elem_value *ucontrol) | 1738 | struct snd_ctl_elem_value *ucontrol) |
1739 | { | 1739 | { |
1740 | struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); | 1740 | struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); |
1741 | struct max98095_priv *max98095 = snd_soc_codec_get_drvdata(codec); | 1741 | struct max98095_priv *max98095 = snd_soc_codec_get_drvdata(codec); |
1742 | struct max98095_pdata *pdata = max98095->pdata; | 1742 | struct max98095_pdata *pdata = max98095->pdata; |
1743 | int channel = max98095_get_eq_channel(kcontrol->id.name); | 1743 | int channel = max98095_get_eq_channel(kcontrol->id.name); |
@@ -1801,7 +1801,7 @@ static int max98095_put_eq_enum(struct snd_kcontrol *kcontrol, | |||
1801 | static int max98095_get_eq_enum(struct snd_kcontrol *kcontrol, | 1801 | static int max98095_get_eq_enum(struct snd_kcontrol *kcontrol, |
1802 | struct snd_ctl_elem_value *ucontrol) | 1802 | struct snd_ctl_elem_value *ucontrol) |
1803 | { | 1803 | { |
1804 | struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); | 1804 | struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); |
1805 | struct max98095_priv *max98095 = snd_soc_codec_get_drvdata(codec); | 1805 | struct max98095_priv *max98095 = snd_soc_codec_get_drvdata(codec); |
1806 | int channel = max98095_get_eq_channel(kcontrol->id.name); | 1806 | int channel = max98095_get_eq_channel(kcontrol->id.name); |
1807 | struct max98095_cdata *cdata; | 1807 | struct max98095_cdata *cdata; |
@@ -1891,7 +1891,7 @@ static int max98095_get_bq_channel(struct snd_soc_codec *codec, | |||
1891 | static int max98095_put_bq_enum(struct snd_kcontrol *kcontrol, | 1891 | static int max98095_put_bq_enum(struct snd_kcontrol *kcontrol, |
1892 | struct snd_ctl_elem_value *ucontrol) | 1892 | struct snd_ctl_elem_value *ucontrol) |
1893 | { | 1893 | { |
1894 | struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); | 1894 | struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); |
1895 | struct max98095_priv *max98095 = snd_soc_codec_get_drvdata(codec); | 1895 | struct max98095_priv *max98095 = snd_soc_codec_get_drvdata(codec); |
1896 | struct max98095_pdata *pdata = max98095->pdata; | 1896 | struct max98095_pdata *pdata = max98095->pdata; |
1897 | int channel = max98095_get_bq_channel(codec, kcontrol->id.name); | 1897 | int channel = max98095_get_bq_channel(codec, kcontrol->id.name); |
@@ -1952,7 +1952,7 @@ static int max98095_put_bq_enum(struct snd_kcontrol *kcontrol, | |||
1952 | static int max98095_get_bq_enum(struct snd_kcontrol *kcontrol, | 1952 | static int max98095_get_bq_enum(struct snd_kcontrol *kcontrol, |
1953 | struct snd_ctl_elem_value *ucontrol) | 1953 | struct snd_ctl_elem_value *ucontrol) |
1954 | { | 1954 | { |
1955 | struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); | 1955 | struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); |
1956 | struct max98095_priv *max98095 = snd_soc_codec_get_drvdata(codec); | 1956 | struct max98095_priv *max98095 = snd_soc_codec_get_drvdata(codec); |
1957 | int channel = max98095_get_bq_channel(codec, kcontrol->id.name); | 1957 | int channel = max98095_get_bq_channel(codec, kcontrol->id.name); |
1958 | struct max98095_cdata *cdata; | 1958 | struct max98095_cdata *cdata; |