* [PATCH 10/29] wl1273: mfd_cell is now implicitly available to drivers
[not found] <1297998456-7615-1-git-send-email-dilinger@queued.net>
@ 2011-02-18 3:07 ` Andres Salomon
2011-02-18 3:07 ` [PATCH 13/29] twl4030: mfd_cell is now implicitly available to drivers (v2) Andres Salomon
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Andres Salomon @ 2011-02-18 3:07 UTC (permalink / raw)
To: Samuel Ortiz
Cc: alsa-devel, linux-media, Takashi Iwai, Mark Brown, linux-kernel,
Mauro Carvalho Chehab, Liam Girdwood
The cell's platform_data is now accessed with a helper function;
change clients to use that, and remove the now-unused data_size.
Signed-off-by: Andres Salomon <dilinger@queued.net>
---
drivers/media/radio/radio-wl1273.c | 2 +-
drivers/mfd/wl1273-core.c | 2 --
sound/soc/codecs/wl1273.c | 3 ++-
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/media/radio/radio-wl1273.c b/drivers/media/radio/radio-wl1273.c
index 7ecc8e6..4698eb0 100644
--- a/drivers/media/radio/radio-wl1273.c
+++ b/drivers/media/radio/radio-wl1273.c
@@ -2138,7 +2138,7 @@ static int wl1273_fm_radio_remove(struct platform_device *pdev)
static int __devinit wl1273_fm_radio_probe(struct platform_device *pdev)
{
- struct wl1273_core **core = pdev->dev.platform_data;
+ struct wl1273_core **core = mfd_get_data(pdev);
struct wl1273_device *radio;
struct v4l2_ctrl *ctrl;
int r = 0;
diff --git a/drivers/mfd/wl1273-core.c b/drivers/mfd/wl1273-core.c
index d2ecc24..703085e 100644
--- a/drivers/mfd/wl1273-core.c
+++ b/drivers/mfd/wl1273-core.c
@@ -80,7 +80,6 @@ static int __devinit wl1273_core_probe(struct i2c_client *client,
cell = &core->cells[children];
cell->name = "wl1273_fm_radio";
cell->platform_data = &core;
- cell->data_size = sizeof(core);
children++;
if (pdata->children & WL1273_CODEC_CHILD) {
@@ -89,7 +88,6 @@ static int __devinit wl1273_core_probe(struct i2c_client *client,
dev_dbg(&client->dev, "%s: Have codec.\n", __func__);
cell->name = "wl1273-codec";
cell->platform_data = &core;
- cell->data_size = sizeof(core);
children++;
}
diff --git a/sound/soc/codecs/wl1273.c b/sound/soc/codecs/wl1273.c
index 861b28f..1ad0d5a 100644
--- a/sound/soc/codecs/wl1273.c
+++ b/sound/soc/codecs/wl1273.c
@@ -436,7 +436,8 @@ EXPORT_SYMBOL_GPL(wl1273_get_format);
static int wl1273_probe(struct snd_soc_codec *codec)
{
- struct wl1273_core **core = codec->dev->platform_data;
+ struct wl1273_core **core =
+ mfd_get_data(to_platform_device(codec->dev));
struct wl1273_priv *wl1273;
int r;
--
1.7.2.3
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 13/29] twl4030: mfd_cell is now implicitly available to drivers (v2)
[not found] <1297998456-7615-1-git-send-email-dilinger@queued.net>
2011-02-18 3:07 ` [PATCH 10/29] wl1273: mfd_cell is now implicitly available to drivers Andres Salomon
@ 2011-02-18 3:07 ` Andres Salomon
2011-02-18 6:44 ` Peter Ujfalusi
2011-02-18 3:07 ` [PATCH 19/29] davinci_voicecodec: use mfd_data instead of driver_data Andres Salomon
2011-02-18 3:07 ` [PATCH 20/29] wm8400-codec: use mfd_data instead of driver_data (v2) Andres Salomon
3 siblings, 1 reply; 6+ messages in thread
From: Andres Salomon @ 2011-02-18 3:07 UTC (permalink / raw)
To: Samuel Ortiz
Cc: alsa-devel, Dmitry Torokhov, Takashi Iwai, Mark Brown,
Peter Ujfalusi, linux-kernel, linux-input, Liam Girdwood
The cell's platform_data is now accessed with a helper function;
change clients to use that, and remove the now-unused data_size.
v2: add some missing mfd/core.h includes.
Signed-off-by: Andres Salomon <dilinger@queued.net>
---
drivers/input/misc/twl4030-vibra.c | 3 ++-
drivers/mfd/twl4030-codec.c | 2 --
sound/soc/codecs/twl4030.c | 6 ++++--
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/drivers/input/misc/twl4030-vibra.c b/drivers/input/misc/twl4030-vibra.c
index 014dd4a..6a11694 100644
--- a/drivers/input/misc/twl4030-vibra.c
+++ b/drivers/input/misc/twl4030-vibra.c
@@ -29,6 +29,7 @@
#include <linux/workqueue.h>
#include <linux/i2c/twl.h>
#include <linux/mfd/twl4030-codec.h>
+#include <linux/mfd/core.h>
#include <linux/input.h>
#include <linux/slab.h>
@@ -196,7 +197,7 @@ static SIMPLE_DEV_PM_OPS(twl4030_vibra_pm_ops,
static int __devinit twl4030_vibra_probe(struct platform_device *pdev)
{
- struct twl4030_codec_vibra_data *pdata = pdev->dev.platform_data;
+ struct twl4030_codec_vibra_data *pdata = mfd_get_data(pdev);
struct vibra_info *info;
int ret;
diff --git a/drivers/mfd/twl4030-codec.c b/drivers/mfd/twl4030-codec.c
index 9a4b196..0f57426 100644
--- a/drivers/mfd/twl4030-codec.c
+++ b/drivers/mfd/twl4030-codec.c
@@ -209,14 +209,12 @@ static int __devinit twl4030_codec_probe(struct platform_device *pdev)
cell = &codec->cells[childs];
cell->name = "twl4030-codec";
cell->platform_data = pdata->audio;
- cell->data_size = sizeof(*pdata->audio);
childs++;
}
if (pdata->vibra) {
cell = &codec->cells[childs];
cell->name = "twl4030-vibra";
cell->platform_data = pdata->vibra;
- cell->data_size = sizeof(*pdata->vibra);
childs++;
}
diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c
index e4d464b..8512800 100644
--- a/sound/soc/codecs/twl4030.c
+++ b/sound/soc/codecs/twl4030.c
@@ -26,6 +26,7 @@
#include <linux/pm.h>
#include <linux/i2c.h>
#include <linux/platform_device.h>
+#include <linux/mfd/core.h>
#include <linux/i2c/twl.h>
#include <linux/slab.h>
#include <sound/core.h>
@@ -732,7 +733,8 @@ static int aif_event(struct snd_soc_dapm_widget *w,
static void headset_ramp(struct snd_soc_codec *codec, int ramp)
{
- struct twl4030_codec_audio_data *pdata = codec->dev->platform_data;
+ struct twl4030_codec_audio_data *pdata =
+ mfd_get_data(to_platform_device(codec->dev));
unsigned char hs_gain, hs_pop;
struct twl4030_priv *twl4030 = snd_soc_codec_get_drvdata(codec);
/* Base values for ramp delay calculation: 2^19 - 2^26 */
@@ -2297,7 +2299,7 @@ static struct snd_soc_codec_driver soc_codec_dev_twl4030 = {
static int __devinit twl4030_codec_probe(struct platform_device *pdev)
{
- struct twl4030_codec_audio_data *pdata = pdev->dev.platform_data;
+ struct twl4030_codec_audio_data *pdata = mfd_get_data(pdev);
if (!pdata) {
dev_err(&pdev->dev, "platform_data is missing\n");
--
1.7.2.3
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 19/29] davinci_voicecodec: use mfd_data instead of driver_data
[not found] <1297998456-7615-1-git-send-email-dilinger@queued.net>
2011-02-18 3:07 ` [PATCH 10/29] wl1273: mfd_cell is now implicitly available to drivers Andres Salomon
2011-02-18 3:07 ` [PATCH 13/29] twl4030: mfd_cell is now implicitly available to drivers (v2) Andres Salomon
@ 2011-02-18 3:07 ` Andres Salomon
2011-02-18 3:07 ` [PATCH 20/29] wm8400-codec: use mfd_data instead of driver_data (v2) Andres Salomon
3 siblings, 0 replies; 6+ messages in thread
From: Andres Salomon @ 2011-02-18 3:07 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>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---
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] 6+ messages in thread
* [PATCH 20/29] wm8400-codec: use mfd_data instead of driver_data (v2)
[not found] <1297998456-7615-1-git-send-email-dilinger@queued.net>
` (2 preceding siblings ...)
2011-02-18 3:07 ` [PATCH 19/29] davinci_voicecodec: use mfd_data instead of driver_data Andres Salomon
@ 2011-02-18 3:07 ` Andres Salomon
2011-02-18 3:51 ` Mark Brown
3 siblings, 1 reply; 6+ messages in thread
From: Andres Salomon @ 2011-02-18 3:07 UTC (permalink / raw)
To: Samuel Ortiz
Cc: Dimitris Papastamos, alsa-devel, Ian Lartey, 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().
v2: add some missing mfd/core.h includes.
Signed-off-by: Andres Salomon <dilinger@queued.net>
---
drivers/mfd/wm8400-core.c | 2 +-
sound/soc/codecs/wm8400.c | 3 ++-
2 files changed, 3 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..736b785 100644
--- a/sound/soc/codecs/wm8400.c
+++ b/sound/soc/codecs/wm8400.c
@@ -22,6 +22,7 @@
#include <linux/regulator/consumer.h>
#include <linux/mfd/wm8400-audio.h>
#include <linux/mfd/wm8400-private.h>
+#include <linux/mfd/core.h>
#include <sound/core.h>
#include <sound/pcm.h>
#include <sound/pcm_params.h>
@@ -1377,7 +1378,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] 6+ messages in thread
* Re: [PATCH 20/29] wm8400-codec: use mfd_data instead of driver_data (v2)
2011-02-18 3:07 ` [PATCH 20/29] wm8400-codec: use mfd_data instead of driver_data (v2) Andres Salomon
@ 2011-02-18 3:51 ` Mark Brown
0 siblings, 0 replies; 6+ messages in thread
From: Mark Brown @ 2011-02-18 3:51 UTC (permalink / raw)
To: Andres Salomon
Cc: Dimitris Papastamos, alsa-devel, Samuel Ortiz, Takashi Iwai,
linux-kernel, Ian Lartey, Liam Girdwood
On Thu, Feb 17, 2011 at 07:07:27PM -0800, Andres Salomon wrote:
> 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().
>
> v2: add some missing mfd/core.h includes.
>
> Signed-off-by: Andres Salomon <dilinger@queued.net>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 13/29] twl4030: mfd_cell is now implicitly available to drivers (v2)
2011-02-18 3:07 ` [PATCH 13/29] twl4030: mfd_cell is now implicitly available to drivers (v2) Andres Salomon
@ 2011-02-18 6:44 ` Peter Ujfalusi
0 siblings, 0 replies; 6+ messages in thread
From: Peter Ujfalusi @ 2011-02-18 6:44 UTC (permalink / raw)
To: ext Andres Salomon
Cc: alsa-devel, Dmitry Torokhov, Samuel Ortiz, Takashi Iwai,
Mark Brown, linux-kernel, linux-input, Liam Girdwood
On 02/18/11 05:07, ext Andres Salomon wrote:
> The cell's platform_data is now accessed with a helper function;
> change clients to use that, and remove the now-unused data_size.
>
> v2: add some missing mfd/core.h includes.
>
> Signed-off-by: Andres Salomon <dilinger@queued.net>
> ---
> drivers/input/misc/twl4030-vibra.c | 3 ++-
> drivers/mfd/twl4030-codec.c | 2 --
> sound/soc/codecs/twl4030.c | 6 ++++--
> 3 files changed, 6 insertions(+), 5 deletions(-)
Acked-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-02-18 6:44 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <1297998456-7615-1-git-send-email-dilinger@queued.net>
2011-02-18 3:07 ` [PATCH 10/29] wl1273: mfd_cell is now implicitly available to drivers Andres Salomon
2011-02-18 3:07 ` [PATCH 13/29] twl4030: mfd_cell is now implicitly available to drivers (v2) Andres Salomon
2011-02-18 6:44 ` Peter Ujfalusi
2011-02-18 3:07 ` [PATCH 19/29] davinci_voicecodec: use mfd_data instead of driver_data Andres Salomon
2011-02-18 3:07 ` [PATCH 20/29] wm8400-codec: use mfd_data instead of driver_data (v2) Andres Salomon
2011-02-18 3:51 ` Mark Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox