aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/wm8961.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/soc/codecs/wm8961.c')
-rw-r--r--sound/soc/codecs/wm8961.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/codecs/wm8961.c b/sound/soc/codecs/wm8961.c
index 50634ab76a5c..5b9a756242f1 100644
--- a/sound/soc/codecs/wm8961.c
+++ b/sound/soc/codecs/wm8961.c
@@ -631,7 +631,7 @@ static int wm8961_hw_params(struct snd_pcm_substream *substream,
631 struct snd_soc_dai *dai) 631 struct snd_soc_dai *dai)
632{ 632{
633 struct snd_soc_codec *codec = dai->codec; 633 struct snd_soc_codec *codec = dai->codec;
634 struct wm8961_priv *wm8961 = codec->private_data; 634 struct wm8961_priv *wm8961 = snd_soc_codec_get_drvdata(codec);
635 int i, best, target, fs; 635 int i, best, target, fs;
636 u16 reg; 636 u16 reg;
637 637
@@ -722,7 +722,7 @@ static int wm8961_set_sysclk(struct snd_soc_dai *dai, int clk_id,
722 int dir) 722 int dir)
723{ 723{
724 struct snd_soc_codec *codec = dai->codec; 724 struct snd_soc_codec *codec = dai->codec;
725 struct wm8961_priv *wm8961 = codec->private_data; 725 struct wm8961_priv *wm8961 = snd_soc_codec_get_drvdata(codec);
726 u16 reg = snd_soc_read(codec, WM8961_CLOCKING1); 726 u16 reg = snd_soc_read(codec, WM8961_CLOCKING1);
727 727
728 if (freq > 33000000) { 728 if (freq > 33000000) {
@@ -1065,7 +1065,7 @@ static int wm8961_register(struct wm8961_priv *wm8961)
1065 INIT_LIST_HEAD(&codec->dapm_widgets); 1065 INIT_LIST_HEAD(&codec->dapm_widgets);
1066 INIT_LIST_HEAD(&codec->dapm_paths); 1066 INIT_LIST_HEAD(&codec->dapm_paths);
1067 1067
1068 codec->private_data = wm8961; 1068 snd_soc_codec_set_drvdata(codec, wm8961);
1069 codec->name = "WM8961"; 1069 codec->name = "WM8961";
1070 codec->owner = THIS_MODULE; 1070 codec->owner = THIS_MODULE;
1071 codec->dai = &wm8961_dai; 1071 codec->dai = &wm8961_dai;