aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/wm8523.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/soc/codecs/wm8523.c')
-rw-r--r--sound/soc/codecs/wm8523.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/soc/codecs/wm8523.c b/sound/soc/codecs/wm8523.c
index 19cd47293424..37242a7d3077 100644
--- a/sound/soc/codecs/wm8523.c
+++ b/sound/soc/codecs/wm8523.c
@@ -138,7 +138,7 @@ static int wm8523_startup(struct snd_pcm_substream *substream,
138 struct snd_soc_dai *dai) 138 struct snd_soc_dai *dai)
139{ 139{
140 struct snd_soc_codec *codec = dai->codec; 140 struct snd_soc_codec *codec = dai->codec;
141 struct wm8523_priv *wm8523 = codec->private_data; 141 struct wm8523_priv *wm8523 = snd_soc_codec_get_drvdata(codec);
142 142
143 /* The set of sample rates that can be supported depends on the 143 /* The set of sample rates that can be supported depends on the
144 * MCLK supplied to the CODEC - enforce this. 144 * MCLK supplied to the CODEC - enforce this.
@@ -164,7 +164,7 @@ static int wm8523_hw_params(struct snd_pcm_substream *substream,
164 struct snd_soc_pcm_runtime *rtd = substream->private_data; 164 struct snd_soc_pcm_runtime *rtd = substream->private_data;
165 struct snd_soc_device *socdev = rtd->socdev; 165 struct snd_soc_device *socdev = rtd->socdev;
166 struct snd_soc_codec *codec = socdev->card->codec; 166 struct snd_soc_codec *codec = socdev->card->codec;
167 struct wm8523_priv *wm8523 = codec->private_data; 167 struct wm8523_priv *wm8523 = snd_soc_codec_get_drvdata(codec);
168 int i; 168 int i;
169 u16 aifctrl1 = snd_soc_read(codec, WM8523_AIF_CTRL1); 169 u16 aifctrl1 = snd_soc_read(codec, WM8523_AIF_CTRL1);
170 u16 aifctrl2 = snd_soc_read(codec, WM8523_AIF_CTRL2); 170 u16 aifctrl2 = snd_soc_read(codec, WM8523_AIF_CTRL2);
@@ -211,7 +211,7 @@ static int wm8523_set_dai_sysclk(struct snd_soc_dai *codec_dai,
211 int clk_id, unsigned int freq, int dir) 211 int clk_id, unsigned int freq, int dir)
212{ 212{
213 struct snd_soc_codec *codec = codec_dai->codec; 213 struct snd_soc_codec *codec = codec_dai->codec;
214 struct wm8523_priv *wm8523 = codec->private_data; 214 struct wm8523_priv *wm8523 = snd_soc_codec_get_drvdata(codec);
215 unsigned int val; 215 unsigned int val;
216 int i; 216 int i;
217 217
@@ -318,7 +318,7 @@ static int wm8523_set_dai_fmt(struct snd_soc_dai *codec_dai,
318static int wm8523_set_bias_level(struct snd_soc_codec *codec, 318static int wm8523_set_bias_level(struct snd_soc_codec *codec,
319 enum snd_soc_bias_level level) 319 enum snd_soc_bias_level level)
320{ 320{
321 struct wm8523_priv *wm8523 = codec->private_data; 321 struct wm8523_priv *wm8523 = snd_soc_codec_get_drvdata(codec);
322 int ret, i; 322 int ret, i;
323 323
324 switch (level) { 324 switch (level) {
@@ -489,7 +489,7 @@ static int wm8523_register(struct wm8523_priv *wm8523,
489 INIT_LIST_HEAD(&codec->dapm_widgets); 489 INIT_LIST_HEAD(&codec->dapm_widgets);
490 INIT_LIST_HEAD(&codec->dapm_paths); 490 INIT_LIST_HEAD(&codec->dapm_paths);
491 491
492 codec->private_data = wm8523; 492 snd_soc_codec_set_drvdata(codec, wm8523);
493 codec->name = "WM8523"; 493 codec->name = "WM8523";
494 codec->owner = THIS_MODULE; 494 codec->owner = THIS_MODULE;
495 codec->bias_level = SND_SOC_BIAS_OFF; 495 codec->bias_level = SND_SOC_BIAS_OFF;