aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/i2c/busses/i2c-xiic.c
diff options
context:
space:
mode:
authorSamuel Ortiz <sameo@linux.intel.com>2011-04-07 19:23:57 -0400
committerSamuel Ortiz <sameo@linux.intel.com>2011-05-26 13:45:05 -0400
commit3271d382c3ffe61ef3d059ef47e635dbe031030e (patch)
tree2612b0030f0fd85ffe7722cbf195ac061a3eaf76 /drivers/i2c/busses/i2c-xiic.c
parent7dc00a0d14992d0083fefccad7839ac837ea55bc (diff)
mfd: Use mfd cell platform_data for timberdale cells platform bits
With the addition of a device platform mfd_cell pointer, MFD drivers can go back to passing platform data back to their sub drivers. This allows for an mfd_cell->mfd_data removal and thus keep the sub drivers MFD agnostic. This is mostly needed for non MFD aware sub drivers. Acked-by: Richard Röjfors <richard.rojfors@pelagicore.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/i2c/busses/i2c-xiic.c')
-rw-r--r--drivers/i2c/busses/i2c-xiic.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/i2c/busses/i2c-xiic.c b/drivers/i2c/busses/i2c-xiic.c
index e9d5ff4d1496..4bb68f35caf2 100644
--- a/drivers/i2c/busses/i2c-xiic.c
+++ b/drivers/i2c/busses/i2c-xiic.c
@@ -34,7 +34,6 @@
34#include <linux/errno.h> 34#include <linux/errno.h>
35#include <linux/delay.h> 35#include <linux/delay.h>
36#include <linux/platform_device.h> 36#include <linux/platform_device.h>
37#include <linux/mfd/core.h>
38#include <linux/i2c.h> 37#include <linux/i2c.h>
39#include <linux/interrupt.h> 38#include <linux/interrupt.h>
40#include <linux/wait.h> 39#include <linux/wait.h>
@@ -705,7 +704,7 @@ static int __devinit xiic_i2c_probe(struct platform_device *pdev)
705 if (irq < 0) 704 if (irq < 0)
706 goto resource_missing; 705 goto resource_missing;
707 706
708 pdata = mfd_get_data(pdev); 707 pdata = (struct xiic_i2c_platform_data *) pdev->dev.platform_data;
709 if (!pdata) 708 if (!pdata)
710 return -EINVAL; 709 return -EINVAL;
711 710