* [PATCH 2/9] davinci_voicecodec: use mfd_data instead of driver_data
[not found] <1297808729-21110-1-git-send-email-dilinger@queued.net>
@ 2011-02-15 22:25 ` Andres Salomon
2011-02-16 21:59 ` Mark Brown
2011-02-15 22:25 ` [PATCH 3/9] wm8400-codec: " Andres Salomon
1 sibling, 1 reply; 4+ messages in thread
From: Andres Salomon @ 2011-02-15 22:25 UTC (permalink / raw)
To: Samuel Ortiz
Cc: alsa-devel, Takashi Iwai, Mark Brown, linux-kernel, Liam Girdwood
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>
---
drivers/mfd/davinci_voicecodec.c | 4 ++--
sound/soc/codecs/cq93vc.c | 3 ++-
sound/soc/davinci/davinci-vcif.c | 2 +-
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/drivers/mfd/davinci_voicecodec.c b/drivers/mfd/davinci_voicecodec.c
index 33c923d..f946c0b 100644
--- a/drivers/mfd/davinci_voicecodec.c
+++ b/drivers/mfd/davinci_voicecodec.c
@@ -119,12 +119,12 @@ static int __init davinci_vc_probe(struct platform_device *pdev)
/* Voice codec interface client */
cell = &davinci_vc->cells[DAVINCI_VC_VCIF_CELL];
cell->name = "davinci_vcif";
- cell->driver_data = davinci_vc;
+ cell->mfd_data = davinci_vc;
/* Voice codec CQ93VC client */
cell = &davinci_vc->cells[DAVINCI_VC_CQ93VC_CELL];
cell->name = "cq93vc";
- cell->driver_data = davinci_vc;
+ cell->mfd_data = davinci_vc;
ret = mfd_add_devices(&pdev->dev, pdev->id, davinci_vc->cells,
DAVINCI_VC_CELLS, NULL, 0);
diff --git a/sound/soc/codecs/cq93vc.c b/sound/soc/codecs/cq93vc.c
index 46dbfd0..b8066ef 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)
static int cq93vc_probe(struct snd_soc_codec *codec)
{
- struct davinci_vc *davinci_vc = codec->dev->platform_data;
+ struct davinci_vc *davinci_vc =
+ mfd_get_data(to_platform_device(codec->dev));
davinci_vc->cq93vc.codec = codec;
codec->control_data = davinci_vc;
diff --git a/sound/soc/davinci/davinci-vcif.c b/sound/soc/davinci/davinci-vcif.c
index 9d2afcc..13e05a3 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 = {
static int davinci_vcif_probe(struct platform_device *pdev)
{
- struct davinci_vc *davinci_vc = platform_get_drvdata(pdev);
+ struct davinci_vc *davinci_vc = mfd_get_data(pdev);
struct davinci_vcif_dev *davinci_vcif_dev;
int ret;
--
1.7.2.3
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH 3/9] wm8400-codec: use mfd_data instead of driver_data
[not found] <1297808729-21110-1-git-send-email-dilinger@queued.net>
2011-02-15 22:25 ` [PATCH 2/9] davinci_voicecodec: use mfd_data instead of driver_data Andres Salomon
@ 2011-02-15 22:25 ` Andres Salomon
2011-02-16 21:29 ` Mark Brown
1 sibling, 1 reply; 4+ messages in thread
From: Andres Salomon @ 2011-02-15 22:25 UTC (permalink / raw)
To: Samuel Ortiz
Cc: Mark Brown, linux-kernel, Ian Lartey, Dimitris Papastamos,
Liam Girdwood, Jaroslav Kysela, Takashi Iwai, alsa-devel
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>
---
drivers/mfd/wm8400-core.c | 2 +-
sound/soc/codecs/wm8400.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/mfd/wm8400-core.c b/drivers/mfd/wm8400-core.c
index 1bfef48..3a6e78c 100644
--- a/drivers/mfd/wm8400-core.c
+++ b/drivers/mfd/wm8400-core.c
@@ -245,7 +245,7 @@ static int wm8400_register_codec(struct wm8400 *wm8400)
{
struct mfd_cell cell = {
.name = "wm8400-codec",
- .driver_data = wm8400,
+ .mfd_data = wm8400,
};
return mfd_add_devices(wm8400->dev, -1, &cell, 1, NULL, 0);
diff --git a/sound/soc/codecs/wm8400.c b/sound/soc/codecs/wm8400.c
index 3c3bc07..ee105c2 100644
--- a/sound/soc/codecs/wm8400.c
+++ b/sound/soc/codecs/wm8400.c
@@ -1377,7 +1377,7 @@ static void wm8400_probe_deferred(struct work_struct *work)
static int wm8400_codec_probe(struct snd_soc_codec *codec)
{
- struct wm8400 *wm8400 = dev_get_platdata(codec->dev);
+ struct wm8400 *wm8400 = mfd_get_data(to_platform_device(codec->dev));
struct wm8400_priv *priv;
int ret;
u16 reg;
--
1.7.2.3
^ permalink raw reply related [flat|nested] 4+ messages in thread