mfd: mfd_cell is now implicitly available to wl1273 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 <dilinger@queued.net> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
Родитель
a23090ada4
Коммит
15de7a41d3
|
@ -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)
|
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 wl1273_device *radio;
|
||||||
struct v4l2_ctrl *ctrl;
|
struct v4l2_ctrl *ctrl;
|
||||||
int r = 0;
|
int r = 0;
|
||||||
|
|
|
@ -79,7 +79,6 @@ static int __devinit wl1273_core_probe(struct i2c_client *client,
|
||||||
cell = &core->cells[children];
|
cell = &core->cells[children];
|
||||||
cell->name = "wl1273_fm_radio";
|
cell->name = "wl1273_fm_radio";
|
||||||
cell->platform_data = &core;
|
cell->platform_data = &core;
|
||||||
cell->data_size = sizeof(core);
|
|
||||||
children++;
|
children++;
|
||||||
|
|
||||||
if (pdata->children & WL1273_CODEC_CHILD) {
|
if (pdata->children & WL1273_CODEC_CHILD) {
|
||||||
|
@ -88,7 +87,6 @@ static int __devinit wl1273_core_probe(struct i2c_client *client,
|
||||||
dev_dbg(&client->dev, "%s: Have codec.\n", __func__);
|
dev_dbg(&client->dev, "%s: Have codec.\n", __func__);
|
||||||
cell->name = "wl1273-codec";
|
cell->name = "wl1273-codec";
|
||||||
cell->platform_data = &core;
|
cell->platform_data = &core;
|
||||||
cell->data_size = sizeof(core);
|
|
||||||
children++;
|
children++;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -436,7 +436,8 @@ EXPORT_SYMBOL_GPL(wl1273_get_format);
|
||||||
|
|
||||||
static int wl1273_probe(struct snd_soc_codec *codec)
|
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;
|
struct wl1273_priv *wl1273;
|
||||||
int r;
|
int r;
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче