From 6cbd759fa07d2ea0ca9b2d6e659a0cbef0b8a19e Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Mon, 11 Apr 2011 23:39:10 -0700
Subject: [PATCH] --- yaml --- r: 248275 b: refs/heads/master c:
 01b07e2d84c887b432353ead846f4497a33b5f5d h: refs/heads/master i:   248273:
 6c46b2062b209d20d40a52823ab2ca69f0a5c722   248271:
 f835492fe97e226d14eab2e00c30a9bc5f59fe06 v: v3

---
 [refs]                          | 2 +-
 trunk/sound/soc/codecs/wm8915.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index d91943fa4a41..53b8b26c12c4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 420dd718ad0bc4a4e07ae0ac7f8eac7545eb253a
+refs/heads/master: 01b07e2d84c887b432353ead846f4497a33b5f5d
diff --git a/trunk/sound/soc/codecs/wm8915.c b/trunk/sound/soc/codecs/wm8915.c
index 3adad2872c7e..083609418bf4 100644
--- a/trunk/sound/soc/codecs/wm8915.c
+++ b/trunk/sound/soc/codecs/wm8915.c
@@ -1997,10 +1997,9 @@ static int fll_factors(struct _fll_div *fll_div, unsigned int Fref,
 	return 0;
 }
 
-static int wm8915_set_fll(struct snd_soc_dai *dai, int fll_id, int source,
+static int wm8915_set_fll(struct snd_soc_codec *codec, int fll_id, int source,
 			  unsigned int Fref, unsigned int Fout)
 {
-	struct snd_soc_codec *codec = dai->codec;
 	struct wm8915_priv *wm8915 = snd_soc_codec_get_drvdata(codec);
 	struct _fll_div fll_div;
 	unsigned long timeout;
@@ -2776,6 +2775,7 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8915 = {
 	.num_dapm_widgets = ARRAY_SIZE(wm8915_dapm_widgets),
 	.dapm_routes = wm8915_dapm_routes,
 	.num_dapm_routes = ARRAY_SIZE(wm8915_dapm_routes),
+	.set_pll = wm8915_set_fll,
 };
 
 #define WM8915_RATES (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_16000 |\
@@ -2788,7 +2788,6 @@ static struct snd_soc_dai_ops wm8915_dai_ops = {
 	.set_fmt = wm8915_set_fmt,
 	.hw_params = wm8915_hw_params,
 	.set_sysclk = wm8915_set_sysclk,
-	.set_pll = wm8915_set_fll,
 };
 
 static struct snd_soc_dai_driver wm8915_dai[] = {