Skip to content

Commit

Permalink
mfd: mfd_cell is now implicitly available to wl1273 drivers
Browse files Browse the repository at this point in the history
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>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
  • Loading branch information
Andres Salomon authored and Samuel Ortiz committed Mar 23, 2011
1 parent a23090a commit 15de7a4
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion drivers/media/radio/radio-wl1273.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 0 additions & 2 deletions drivers/mfd/wl1273-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,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) {
Expand All @@ -88,7 +87,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++;
}

Expand Down
3 changes: 2 additions & 1 deletion sound/soc/codecs/wl1273.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

0 comments on commit 15de7a4

Please sign in to comment.