wl1273: mfd_cell is now implicitly available to drivers

PATCH In review Andres Salomon 1 participant 1 message Feb 12, 2011

Subsystems (4)

Media (V4L/DVB) Sound ASoC Multifunction devices (MFD)

lore

Share & tools

lore

Andres Salomon

author

2011-02-12 02:12 UTC #0 lore raw

PATCH 10/17 wl1273: 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/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(-)

drivers/media/radio/radio-wl1273.c +1 -1

index 7ecc8e6..4698eb0 100644
@@ -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;

drivers/mfd/wl1273-core.c +0 -2

index d2ecc24..703085e 100644
@@ -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++;
 	}

sound/soc/codecs/wl1273.c +2 -1

index 861b28f..1ad0d5a 100644
@@ -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;

Signature · 1 line

1.7.2.3