Merge tag 'mfd-lee-3.12-1' of git://git.linaro.org/people/ljones/mfd

Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/mfd/htc-i2cpld.c b/drivers/mfd/htc-i2cpld.c
index c9dfce6ae0c2..d7b2a75aca3e 100644
--- a/drivers/mfd/htc-i2cpld.c
+++ b/drivers/mfd/htc-i2cpld.c
@@ -340,7 +340,7 @@ static int htcpld_setup_chip_irq(
         int ret = 0;
 
         /* Get the platform and driver data */
-        pdata = dev->platform_data;
+        pdata = dev_get_platdata(dev);
         htcpld = platform_get_drvdata(pdev);
         chip = &htcpld->chip[chip_index];
         plat_chip_data = &pdata->chip[chip_index];
@@ -375,7 +375,7 @@ static int htcpld_register_chip_i2c(
         struct i2c_board_info info;
 
         /* Get the platform and driver data */
-        pdata = dev->platform_data;
+        pdata = dev_get_platdata(dev);
         htcpld = platform_get_drvdata(pdev);
         chip = &htcpld->chip[chip_index];
         plat_chip_data = &pdata->chip[chip_index];
@@ -447,7 +447,7 @@ static int htcpld_register_chip_gpio(
         int ret = 0;
 
         /* Get the platform and driver data */
-        pdata = dev->platform_data;
+        pdata = dev_get_platdata(dev);
         htcpld = platform_get_drvdata(pdev);
         chip = &htcpld->chip[chip_index];
         plat_chip_data = &pdata->chip[chip_index];
@@ -509,7 +509,7 @@ static int htcpld_setup_chips(struct platform_device *pdev)
         int i;
 
         /* Get the platform and driver data */
-        pdata = dev->platform_data;
+        pdata = dev_get_platdata(dev);
         htcpld = platform_get_drvdata(pdev);
 
         /* Setup each chip's output GPIOs */
@@ -574,7 +574,7 @@ static int htcpld_core_probe(struct platform_device *pdev)
         if (!dev)
                 return -ENODEV;
 
-        pdata = dev->platform_data;
+        pdata = dev_get_platdata(dev);
         if (!pdata) {
                 dev_warn(dev, "Platform data not found for htcpld core!\n");
                 return -ENXIO;