diff options
| author | Jin Park <jinyoungp@nvidia.com> | 2011-09-28 17:13:03 +0900 |
|---|---|---|
| committer | Varun Colbert <vcolbert@nvidia.com> | 2011-09-29 11:48:08 -0700 |
| commit | 2eb8579c851c0e14b132caa80ce48552b8a63663 (patch) | |
| tree | c6e2d3fb6b89130983f553b89a788d9608995036 | |
| parent | bbbbb62e59897159a5350e2357a470b5dd0c9ce5 (diff) | |
mfd: aat2870: Update the driver to new mfd core
The mfd core was updated that removed size_t data_size and
renamed void *platform_data to void *mfd_data in struct mfd_cell.
The new mfd API, mfd_get_data(), was added for mfd device.
It return from struct platform_device to right value of mfd_data
and platform_data.
Change-Id: I9b61d0ac0139be840c328fc0b266752d27815cf5
Signed-off-by: Jin Park <jinyoungp@nvidia.com>
Reviewed-on: http://git-master/r/54912
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
| -rw-r--r-- | drivers/mfd/aat2870-core.c | 7 | ||||
| -rw-r--r-- | drivers/regulator/aat2870-regulator.c | 5 | ||||
| -rw-r--r-- | drivers/video/backlight/aat2870_bl.c | 3 |
3 files changed, 6 insertions, 9 deletions
diff --git a/drivers/mfd/aat2870-core.c b/drivers/mfd/aat2870-core.c index 9deb3f34751b..e7a4e2ab6cdc 100644 --- a/drivers/mfd/aat2870-core.c +++ b/drivers/mfd/aat2870-core.c @@ -79,27 +79,22 @@ static struct mfd_cell aat2870_devs[] = { { .name = "aat2870-backlight", .id = AAT2870_ID_BL, - .data_size = sizeof(struct aat2870_bl_platform_data), }, { .name = "aat2870-regulator", .id = AAT2870_ID_LDOA, - .data_size = sizeof(struct regulator_init_data), }, { .name = "aat2870-regulator", .id = AAT2870_ID_LDOB, - .data_size = sizeof(struct regulator_init_data), }, { .name = "aat2870-regulator", .id = AAT2870_ID_LDOC, - .data_size = sizeof(struct regulator_init_data), }, { .name = "aat2870-regulator", .id = AAT2870_ID_LDOD, - .data_size = sizeof(struct regulator_init_data), }, }; @@ -423,7 +418,7 @@ static int aat2870_i2c_probe(struct i2c_client *client, if ((pdata->subdevs[i].id == aat2870_devs[j].id) && !strcmp(pdata->subdevs[i].name, aat2870_devs[j].name)) { - aat2870_devs[j].platform_data = + aat2870_devs[j].mfd_data = pdata->subdevs[i].platform_data; break; } diff --git a/drivers/regulator/aat2870-regulator.c b/drivers/regulator/aat2870-regulator.c index ae6ddaf3e5a2..f940d2876367 100644 --- a/drivers/regulator/aat2870-regulator.c +++ b/drivers/regulator/aat2870-regulator.c @@ -27,6 +27,7 @@ #include <linux/platform_device.h> #include <linux/regulator/driver.h> #include <linux/regulator/machine.h> +#include <linux/mfd/core.h> #include <linux/mfd/aat2870.h> struct aat2870_regulator { @@ -211,8 +212,8 @@ static int aat2870_regulator_probe(struct platform_device *pdev) } ri->pdev = pdev; - rdev = regulator_register(&ri->desc, &pdev->dev, - pdev->dev.platform_data, ri); + rdev = regulator_register(&ri->desc, &pdev->dev, mfd_get_data(pdev), + ri); if (IS_ERR(rdev)) { dev_err(&pdev->dev, "Failed to register regulator %s\n", ri->desc.name); diff --git a/drivers/video/backlight/aat2870_bl.c b/drivers/video/backlight/aat2870_bl.c index 770aa2d0280a..abcbc0d388aa 100644 --- a/drivers/video/backlight/aat2870_bl.c +++ b/drivers/video/backlight/aat2870_bl.c @@ -27,6 +27,7 @@ #include <linux/delay.h> #include <linux/fb.h> #include <linux/backlight.h> +#include <linux/mfd/core.h> #include <linux/mfd/aat2870.h> struct aat2870_bl_driver_data { @@ -127,7 +128,7 @@ static const struct backlight_ops aat2870_bl_ops = { static int aat2870_bl_probe(struct platform_device *pdev) { - struct aat2870_bl_platform_data *pdata = pdev->dev.platform_data; + struct aat2870_bl_platform_data *pdata = mfd_get_data(pdev); struct aat2870_bl_driver_data *aat2870_bl; struct backlight_device *bd; struct backlight_properties props; |