diff options
Diffstat (limited to 'sound/soc/codecs/wm8994.c')
-rw-r--r-- | sound/soc/codecs/wm8994.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c index c26291844e5..8ae6585edbe 100644 --- a/sound/soc/codecs/wm8994.c +++ b/sound/soc/codecs/wm8994.c | |||
@@ -2867,7 +2867,7 @@ static void wm8994_handle_retune_mobile_pdata(struct wm8994_priv *wm8994) | |||
2867 | wm8994->retune_mobile_enum.max = wm8994->num_retune_mobile_texts; | 2867 | wm8994->retune_mobile_enum.max = wm8994->num_retune_mobile_texts; |
2868 | wm8994->retune_mobile_enum.texts = wm8994->retune_mobile_texts; | 2868 | wm8994->retune_mobile_enum.texts = wm8994->retune_mobile_texts; |
2869 | 2869 | ||
2870 | ret = snd_soc_add_controls(wm8994->codec, controls, | 2870 | ret = snd_soc_add_codec_controls(wm8994->codec, controls, |
2871 | ARRAY_SIZE(controls)); | 2871 | ARRAY_SIZE(controls)); |
2872 | if (ret != 0) | 2872 | if (ret != 0) |
2873 | dev_err(wm8994->codec->dev, | 2873 | dev_err(wm8994->codec->dev, |
@@ -2920,7 +2920,7 @@ static void wm8994_handle_pdata(struct wm8994_priv *wm8994) | |||
2920 | wm8994->drc_enum.max = pdata->num_drc_cfgs; | 2920 | wm8994->drc_enum.max = pdata->num_drc_cfgs; |
2921 | wm8994->drc_enum.texts = wm8994->drc_texts; | 2921 | wm8994->drc_enum.texts = wm8994->drc_texts; |
2922 | 2922 | ||
2923 | ret = snd_soc_add_controls(wm8994->codec, controls, | 2923 | ret = snd_soc_add_codec_controls(wm8994->codec, controls, |
2924 | ARRAY_SIZE(controls)); | 2924 | ARRAY_SIZE(controls)); |
2925 | if (ret != 0) | 2925 | if (ret != 0) |
2926 | dev_err(wm8994->codec->dev, | 2926 | dev_err(wm8994->codec->dev, |
@@ -2936,7 +2936,7 @@ static void wm8994_handle_pdata(struct wm8994_priv *wm8994) | |||
2936 | if (pdata->num_retune_mobile_cfgs) | 2936 | if (pdata->num_retune_mobile_cfgs) |
2937 | wm8994_handle_retune_mobile_pdata(wm8994); | 2937 | wm8994_handle_retune_mobile_pdata(wm8994); |
2938 | else | 2938 | else |
2939 | snd_soc_add_controls(wm8994->codec, wm8994_eq_controls, | 2939 | snd_soc_add_codec_controls(wm8994->codec, wm8994_eq_controls, |
2940 | ARRAY_SIZE(wm8994_eq_controls)); | 2940 | ARRAY_SIZE(wm8994_eq_controls)); |
2941 | 2941 | ||
2942 | for (i = 0; i < ARRAY_SIZE(pdata->micbias); i++) { | 2942 | for (i = 0; i < ARRAY_SIZE(pdata->micbias); i++) { |
@@ -3652,7 +3652,7 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec) | |||
3652 | wm8994_handle_pdata(wm8994); | 3652 | wm8994_handle_pdata(wm8994); |
3653 | 3653 | ||
3654 | wm_hubs_add_analogue_controls(codec); | 3654 | wm_hubs_add_analogue_controls(codec); |
3655 | snd_soc_add_controls(codec, wm8994_snd_controls, | 3655 | snd_soc_add_codec_controls(codec, wm8994_snd_controls, |
3656 | ARRAY_SIZE(wm8994_snd_controls)); | 3656 | ARRAY_SIZE(wm8994_snd_controls)); |
3657 | snd_soc_dapm_new_controls(dapm, wm8994_dapm_widgets, | 3657 | snd_soc_dapm_new_controls(dapm, wm8994_dapm_widgets, |
3658 | ARRAY_SIZE(wm8994_dapm_widgets)); | 3658 | ARRAY_SIZE(wm8994_dapm_widgets)); |
@@ -3678,7 +3678,7 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec) | |||
3678 | } | 3678 | } |
3679 | break; | 3679 | break; |
3680 | case WM8958: | 3680 | case WM8958: |
3681 | snd_soc_add_controls(codec, wm8958_snd_controls, | 3681 | snd_soc_add_codec_controls(codec, wm8958_snd_controls, |
3682 | ARRAY_SIZE(wm8958_snd_controls)); | 3682 | ARRAY_SIZE(wm8958_snd_controls)); |
3683 | snd_soc_dapm_new_controls(dapm, wm8958_dapm_widgets, | 3683 | snd_soc_dapm_new_controls(dapm, wm8958_dapm_widgets, |
3684 | ARRAY_SIZE(wm8958_dapm_widgets)); | 3684 | ARRAY_SIZE(wm8958_dapm_widgets)); |
@@ -3700,7 +3700,7 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec) | |||
3700 | break; | 3700 | break; |
3701 | 3701 | ||
3702 | case WM1811: | 3702 | case WM1811: |
3703 | snd_soc_add_controls(codec, wm8958_snd_controls, | 3703 | snd_soc_add_codec_controls(codec, wm8958_snd_controls, |
3704 | ARRAY_SIZE(wm8958_snd_controls)); | 3704 | ARRAY_SIZE(wm8958_snd_controls)); |
3705 | snd_soc_dapm_new_controls(dapm, wm8958_dapm_widgets, | 3705 | snd_soc_dapm_new_controls(dapm, wm8958_dapm_widgets, |
3706 | ARRAY_SIZE(wm8958_dapm_widgets)); | 3706 | ARRAY_SIZE(wm8958_dapm_widgets)); |