2011-02-12 02:15:43

by Andres Salomon

Subject: [PATCH 13/17] twl4030: mfd_cell is now implicitly available to drivers

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 <[email protected]>
---
drivers/input/misc/twl4030-vibra.c | 2 +-
drivers/mfd/twl4030-codec.c | 2 --
sound/soc/codecs/twl4030.c | 5 +++--
3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/drivers/input/misc/twl4030-vibra.c b/drivers/input/misc/twl4030-vibra.c
index 014dd4a..1246ae1 100644
--- a/drivers/input/misc/twl4030-vibra.c
+++ b/drivers/input/misc/twl4030-vibra.c
@@ -196,7 +196,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..37004afb 100644
--- a/sound/soc/codecs/twl4030.c
+++ b/sound/soc/codecs/twl4030.c
@@ -732,7 +732,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 +2298,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

2011-02-12 15:16:38

by Peter Ujfalusi

Subject: RE: [PATCH 13/17] twl4030: mfd_cell is now implicitly available to drivers

> ________________________________________
> From: ext Andres Salomon [[email protected]]
> Sent: Saturday, February 12, 2011 04:15
> To: Samuel Ortiz
> Cc: [email protected]; Mark Brown; Dmitry Torokhov; Ujfalusi Peter (Nokia-MS/Tampere); Liam Girdwood; Jaroslav Kysela; Takashi Iwai; [email protected]; [email protected]
> Subject: [PATCH 13/17] twl4030: mfd_cell is now implicitly available to drivers
>
> 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 <[email protected]>
> ---

Acked-by: Peter Ujfalusi <[email protected]>-