aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorAndres Salomon <dilinger@queued.net>2011-02-17 22:07:27 -0500
committerSamuel Ortiz <sameo@linux.intel.com>2011-03-23 05:41:56 -0400
commitdab1547a011b221308b6e991405677c78e1a8956 (patch)
treeea70aef87047ac708c406ce9b9995c91de886180 /sound/soc
parentd57763370e1e12dd72e5a7bc6d6a7644e0003593 (diff)
asoc: wm8400-codec: Use mfd_data instead of driver_data
Use mfd_data for passing information from mfd drivers to soc clients. The mfd_cell's driver_data field is being phased out. Clients that were using driver_data now access .mfd_data via mfd_get_data(). Signed-off-by: Andres Salomon <dilinger@queued.net> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/codecs/wm8400.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8400.c b/sound/soc/codecs/wm8400.c
index 3c3bc079167e..736b785e3756 100644
--- a/sound/soc/codecs/wm8400.c
+++ b/sound/soc/codecs/wm8400.c
@@ -22,6 +22,7 @@
22#include <linux/regulator/consumer.h> 22#include <linux/regulator/consumer.h>
23#include <linux/mfd/wm8400-audio.h> 23#include <linux/mfd/wm8400-audio.h>
24#include <linux/mfd/wm8400-private.h> 24#include <linux/mfd/wm8400-private.h>
25#include <linux/mfd/core.h>
25#include <sound/core.h> 26#include <sound/core.h>
26#include <sound/pcm.h> 27#include <sound/pcm.h>
27#include <sound/pcm_params.h> 28#include <sound/pcm_params.h>
@@ -1377,7 +1378,7 @@ static void wm8400_probe_deferred(struct work_struct *work)
1377 1378
1378static int wm8400_codec_probe(struct snd_soc_codec *codec) 1379static int wm8400_codec_probe(struct snd_soc_codec *codec)
1379{ 1380{
1380 struct wm8400 *wm8400 = dev_get_platdata(codec->dev); 1381 struct wm8400 *wm8400 = mfd_get_data(to_platform_device(codec->dev));
1381 struct wm8400_priv *priv; 1382 struct wm8400_priv *priv;
1382 int ret; 1383 int ret;
1383 u16 reg; 1384 u16 reg;