diff options
author | Takashi Iwai <tiwai@suse.de> | 2010-05-20 06:00:43 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2010-05-20 06:00:43 -0400 |
commit | d71f4cece4bd97d05592836202fc04ff2e7817e3 (patch) | |
tree | 6c877c7a938758b1323d9c97d46b9c536e618c69 /sound/soc/codecs/wm8776.c | |
parent | 19008bdacb9f7841166ebafe0aef361ee582ffbf (diff) | |
parent | ad8332c1302bcb4f80d593fd3eb477be9d7f5604 (diff) |
Merge branch 'topic/asoc' into for-linus
Conflicts:
sound/soc/codecs/ad1938.c
Diffstat (limited to 'sound/soc/codecs/wm8776.c')
-rw-r--r-- | sound/soc/codecs/wm8776.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/codecs/wm8776.c b/sound/soc/codecs/wm8776.c index 60b1b3e1094b..7e4a627b4c7e 100644 --- a/sound/soc/codecs/wm8776.c +++ b/sound/soc/codecs/wm8776.c | |||
@@ -227,7 +227,7 @@ static int wm8776_hw_params(struct snd_pcm_substream *substream, | |||
227 | struct snd_soc_dai *dai) | 227 | struct snd_soc_dai *dai) |
228 | { | 228 | { |
229 | struct snd_soc_codec *codec = dai->codec; | 229 | struct snd_soc_codec *codec = dai->codec; |
230 | struct wm8776_priv *wm8776 = codec->private_data; | 230 | struct wm8776_priv *wm8776 = snd_soc_codec_get_drvdata(codec); |
231 | int iface_reg, iface; | 231 | int iface_reg, iface; |
232 | int ratio_shift, master; | 232 | int ratio_shift, master; |
233 | int i; | 233 | int i; |
@@ -304,7 +304,7 @@ static int wm8776_set_sysclk(struct snd_soc_dai *dai, | |||
304 | int clk_id, unsigned int freq, int dir) | 304 | int clk_id, unsigned int freq, int dir) |
305 | { | 305 | { |
306 | struct snd_soc_codec *codec = dai->codec; | 306 | struct snd_soc_codec *codec = dai->codec; |
307 | struct wm8776_priv *wm8776 = codec->private_data; | 307 | struct wm8776_priv *wm8776 = snd_soc_codec_get_drvdata(codec); |
308 | 308 | ||
309 | BUG_ON(dai->id >= ARRAY_SIZE(wm8776->sysclk)); | 309 | BUG_ON(dai->id >= ARRAY_SIZE(wm8776->sysclk)); |
310 | 310 | ||
@@ -491,7 +491,7 @@ static int wm8776_register(struct wm8776_priv *wm8776, | |||
491 | INIT_LIST_HEAD(&codec->dapm_widgets); | 491 | INIT_LIST_HEAD(&codec->dapm_widgets); |
492 | INIT_LIST_HEAD(&codec->dapm_paths); | 492 | INIT_LIST_HEAD(&codec->dapm_paths); |
493 | 493 | ||
494 | codec->private_data = wm8776; | 494 | snd_soc_codec_set_drvdata(codec, wm8776); |
495 | codec->name = "WM8776"; | 495 | codec->name = "WM8776"; |
496 | codec->owner = THIS_MODULE; | 496 | codec->owner = THIS_MODULE; |
497 | codec->bias_level = SND_SOC_BIAS_OFF; | 497 | codec->bias_level = SND_SOC_BIAS_OFF; |