diff options
Diffstat (limited to 'sound/soc/codecs/max98088.c')
-rw-r--r-- | sound/soc/codecs/max98088.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sound/soc/codecs/max98088.c b/sound/soc/codecs/max98088.c index ef7cf89f5623..9134982807b5 100644 --- a/sound/soc/codecs/max98088.c +++ b/sound/soc/codecs/max98088.c | |||
@@ -635,7 +635,7 @@ static SOC_ENUM_SINGLE_DECL(max98088_dai1_adc_filter_enum, | |||
635 | static int max98088_mic1pre_set(struct snd_kcontrol *kcontrol, | 635 | static int max98088_mic1pre_set(struct snd_kcontrol *kcontrol, |
636 | struct snd_ctl_elem_value *ucontrol) | 636 | struct snd_ctl_elem_value *ucontrol) |
637 | { | 637 | { |
638 | struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); | 638 | struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); |
639 | struct max98088_priv *max98088 = snd_soc_codec_get_drvdata(codec); | 639 | struct max98088_priv *max98088 = snd_soc_codec_get_drvdata(codec); |
640 | unsigned int sel = ucontrol->value.integer.value[0]; | 640 | unsigned int sel = ucontrol->value.integer.value[0]; |
641 | 641 | ||
@@ -649,7 +649,7 @@ static int max98088_mic1pre_set(struct snd_kcontrol *kcontrol, | |||
649 | static int max98088_mic1pre_get(struct snd_kcontrol *kcontrol, | 649 | static int max98088_mic1pre_get(struct snd_kcontrol *kcontrol, |
650 | struct snd_ctl_elem_value *ucontrol) | 650 | struct snd_ctl_elem_value *ucontrol) |
651 | { | 651 | { |
652 | struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); | 652 | struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); |
653 | struct max98088_priv *max98088 = snd_soc_codec_get_drvdata(codec); | 653 | struct max98088_priv *max98088 = snd_soc_codec_get_drvdata(codec); |
654 | 654 | ||
655 | ucontrol->value.integer.value[0] = max98088->mic1pre; | 655 | ucontrol->value.integer.value[0] = max98088->mic1pre; |
@@ -659,7 +659,7 @@ static int max98088_mic1pre_get(struct snd_kcontrol *kcontrol, | |||
659 | static int max98088_mic2pre_set(struct snd_kcontrol *kcontrol, | 659 | static int max98088_mic2pre_set(struct snd_kcontrol *kcontrol, |
660 | struct snd_ctl_elem_value *ucontrol) | 660 | struct snd_ctl_elem_value *ucontrol) |
661 | { | 661 | { |
662 | struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); | 662 | struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); |
663 | struct max98088_priv *max98088 = snd_soc_codec_get_drvdata(codec); | 663 | struct max98088_priv *max98088 = snd_soc_codec_get_drvdata(codec); |
664 | unsigned int sel = ucontrol->value.integer.value[0]; | 664 | unsigned int sel = ucontrol->value.integer.value[0]; |
665 | 665 | ||
@@ -673,7 +673,7 @@ static int max98088_mic2pre_set(struct snd_kcontrol *kcontrol, | |||
673 | static int max98088_mic2pre_get(struct snd_kcontrol *kcontrol, | 673 | static int max98088_mic2pre_get(struct snd_kcontrol *kcontrol, |
674 | struct snd_ctl_elem_value *ucontrol) | 674 | struct snd_ctl_elem_value *ucontrol) |
675 | { | 675 | { |
676 | struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); | 676 | struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); |
677 | struct max98088_priv *max98088 = snd_soc_codec_get_drvdata(codec); | 677 | struct max98088_priv *max98088 = snd_soc_codec_get_drvdata(codec); |
678 | 678 | ||
679 | ucontrol->value.integer.value[0] = max98088->mic2pre; | 679 | ucontrol->value.integer.value[0] = max98088->mic2pre; |
@@ -1750,7 +1750,7 @@ static void max98088_setup_eq2(struct snd_soc_codec *codec) | |||
1750 | static int max98088_put_eq_enum(struct snd_kcontrol *kcontrol, | 1750 | static int max98088_put_eq_enum(struct snd_kcontrol *kcontrol, |
1751 | struct snd_ctl_elem_value *ucontrol) | 1751 | struct snd_ctl_elem_value *ucontrol) |
1752 | { | 1752 | { |
1753 | struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); | 1753 | struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); |
1754 | struct max98088_priv *max98088 = snd_soc_codec_get_drvdata(codec); | 1754 | struct max98088_priv *max98088 = snd_soc_codec_get_drvdata(codec); |
1755 | struct max98088_pdata *pdata = max98088->pdata; | 1755 | struct max98088_pdata *pdata = max98088->pdata; |
1756 | int channel = max98088_get_channel(codec, kcontrol->id.name); | 1756 | int channel = max98088_get_channel(codec, kcontrol->id.name); |
@@ -1782,7 +1782,7 @@ static int max98088_put_eq_enum(struct snd_kcontrol *kcontrol, | |||
1782 | static int max98088_get_eq_enum(struct snd_kcontrol *kcontrol, | 1782 | static int max98088_get_eq_enum(struct snd_kcontrol *kcontrol, |
1783 | struct snd_ctl_elem_value *ucontrol) | 1783 | struct snd_ctl_elem_value *ucontrol) |
1784 | { | 1784 | { |
1785 | struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); | 1785 | struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); |
1786 | struct max98088_priv *max98088 = snd_soc_codec_get_drvdata(codec); | 1786 | struct max98088_priv *max98088 = snd_soc_codec_get_drvdata(codec); |
1787 | int channel = max98088_get_channel(codec, kcontrol->id.name); | 1787 | int channel = max98088_get_channel(codec, kcontrol->id.name); |
1788 | struct max98088_cdata *cdata; | 1788 | struct max98088_cdata *cdata; |