aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorAndres Salomon <dilinger@queued.net>2011-02-28 11:24:03 -0500
committerSamuel Ortiz <sameo@linux.intel.com>2011-03-23 05:41:56 -0400
commitd57763370e1e12dd72e5a7bc6d6a7644e0003593 (patch)
tree84ed84147274556a546f01f4a99bf9df93345604 /sound
parent65e523595a31813c0f20ffd249792c60e253438e (diff)
asoc: davinci_voicecodec: 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')
-rw-r--r--sound/soc/codecs/cq93vc.c3
-rw-r--r--sound/soc/davinci/davinci-vcif.c2
2 files changed, 3 insertions, 2 deletions
diff --git a/sound/soc/codecs/cq93vc.c b/sound/soc/codecs/cq93vc.c
index 347a567b01e1..b8066ef10bb0 100644
--- a/sound/soc/codecs/cq93vc.c
+++ b/sound/soc/codecs/cq93vc.c
@@ -153,7 +153,8 @@ static int cq93vc_resume(struct snd_soc_codec *codec)
153 153
154static int cq93vc_probe(struct snd_soc_codec *codec) 154static int cq93vc_probe(struct snd_soc_codec *codec)
155{ 155{
156 struct davinci_vc *davinci_vc = snd_soc_codec_get_drvdata(codec); 156 struct davinci_vc *davinci_vc =
157 mfd_get_data(to_platform_device(codec->dev));
157 158
158 davinci_vc->cq93vc.codec = codec; 159 davinci_vc->cq93vc.codec = codec;
159 codec->control_data = davinci_vc; 160 codec->control_data = davinci_vc;
diff --git a/sound/soc/davinci/davinci-vcif.c b/sound/soc/davinci/davinci-vcif.c
index 9d2afccc3a2d..13e05a302a92 100644
--- a/sound/soc/davinci/davinci-vcif.c
+++ b/sound/soc/davinci/davinci-vcif.c
@@ -205,7 +205,7 @@ static struct snd_soc_dai_driver davinci_vcif_dai = {
205 205
206static int davinci_vcif_probe(struct platform_device *pdev) 206static int davinci_vcif_probe(struct platform_device *pdev)
207{ 207{
208 struct davinci_vc *davinci_vc = platform_get_drvdata(pdev); 208 struct davinci_vc *davinci_vc = mfd_get_data(pdev);
209 struct davinci_vcif_dev *davinci_vcif_dev; 209 struct davinci_vcif_dev *davinci_vcif_dev;
210 int ret; 210 int ret;
211 211