diff options
Diffstat (limited to 'sound/soc/codecs/wm8960.c')
-rw-r--r-- | sound/soc/codecs/wm8960.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/codecs/wm8960.c b/sound/soc/codecs/wm8960.c index c2960d3ec6df..eba3ac013119 100644 --- a/sound/soc/codecs/wm8960.c +++ b/sound/soc/codecs/wm8960.c | |||
@@ -331,7 +331,7 @@ static const struct snd_soc_dapm_route audio_paths_capless[] = { | |||
331 | static int wm8960_add_widgets(struct snd_soc_codec *codec) | 331 | static int wm8960_add_widgets(struct snd_soc_codec *codec) |
332 | { | 332 | { |
333 | struct wm8960_data *pdata = codec->dev->platform_data; | 333 | struct wm8960_data *pdata = codec->dev->platform_data; |
334 | struct wm8960_priv *wm8960 = codec->private_data; | 334 | struct wm8960_priv *wm8960 = snd_soc_codec_get_drvdata(codec); |
335 | struct snd_soc_dapm_widget *w; | 335 | struct snd_soc_dapm_widget *w; |
336 | 336 | ||
337 | snd_soc_dapm_new_controls(codec, wm8960_dapm_widgets, | 337 | snd_soc_dapm_new_controls(codec, wm8960_dapm_widgets, |
@@ -534,7 +534,7 @@ static int wm8960_set_bias_level_out3(struct snd_soc_codec *codec, | |||
534 | static int wm8960_set_bias_level_capless(struct snd_soc_codec *codec, | 534 | static int wm8960_set_bias_level_capless(struct snd_soc_codec *codec, |
535 | enum snd_soc_bias_level level) | 535 | enum snd_soc_bias_level level) |
536 | { | 536 | { |
537 | struct wm8960_priv *wm8960 = codec->private_data; | 537 | struct wm8960_priv *wm8960 = snd_soc_codec_get_drvdata(codec); |
538 | int reg; | 538 | int reg; |
539 | 539 | ||
540 | switch (level) { | 540 | switch (level) { |
@@ -915,7 +915,7 @@ static int wm8960_register(struct wm8960_priv *wm8960, | |||
915 | INIT_LIST_HEAD(&codec->dapm_widgets); | 915 | INIT_LIST_HEAD(&codec->dapm_widgets); |
916 | INIT_LIST_HEAD(&codec->dapm_paths); | 916 | INIT_LIST_HEAD(&codec->dapm_paths); |
917 | 917 | ||
918 | codec->private_data = wm8960; | 918 | snd_soc_codec_set_drvdata(codec, wm8960); |
919 | codec->name = "WM8960"; | 919 | codec->name = "WM8960"; |
920 | codec->owner = THIS_MODULE; | 920 | codec->owner = THIS_MODULE; |
921 | codec->bias_level = SND_SOC_BIAS_OFF; | 921 | codec->bias_level = SND_SOC_BIAS_OFF; |