2 files changed, 4 insertions, 3 deletions

diff --git a/drivers/mfd/tps6105x.c b/drivers/mfd/tps6105x.c
index 46d8205646b6..a293b978e27c 100644
--- a/drivers/mfd/tps6105x.c
+++ b/drivers/mfd/tps6105x.c
@@ -183,7 +183,8 @@ static int __devinit tps6105x_probe(struct i2c_client *client,
         /* Set up and register the platform devices. */
         for (i = 0; i < ARRAY_SIZE(tps6105x_cells); i++) {
                 /* One state holder for all drivers, this is simple */
-                tps6105x_cells[i].mfd_data = tps6105x;
+                tps6105x_cells[i].platform_data = tps6105x;
+                tps6105x_cells[i].pdata_size = sizeof(*tps6105x);
         }
 
         ret = mfd_add_devices(&client->dev, 0, tps6105x_cells,
diff --git a/drivers/regulator/tps6105x-regulator.c b/drivers/regulator/tps6105x-regulator.c
index 1661499feda4..a4d7f4540c18 100644
--- a/drivers/regulator/tps6105x-regulator.c
+++ b/drivers/regulator/tps6105x-regulator.c
@@ -137,7 +137,7 @@ static struct regulator_desc tps6105x_regulator_desc = {
  */
 static int __devinit tps6105x_regulator_probe(struct platform_device *pdev)
 {
-        struct tps6105x *tps6105x = mfd_get_data(pdev);
+        struct tps6105x *tps6105x = dev_get_platdata(&pdev->dev);
         struct tps6105x_platform_data *pdata = tps6105x->pdata;
         int ret;
 
@@ -164,7 +164,7 @@ static int __devinit tps6105x_regulator_probe(struct platform_device *pdev)
 
 static int __devexit tps6105x_regulator_remove(struct platform_device *pdev)
 {
-        struct tps6105x *tps6105x = platform_get_drvdata(pdev);
+        struct tps6105x *tps6105x = dev_get_platdata(&pdev->dev);
         regulator_unregister(tps6105x->regulator);
         return 0;
 }