aboutsummaryrefslogtreecommitdiff
path: root/drivers/regulator
diff options
context:
space:
mode:
authorAndres Salomon <dilinger@queued.net>2011-02-17 19:07:12 -0800
committerNicolas Pitre <nicolas.pitre@linaro.org>2011-03-25 17:58:18 -0400
commit85ef62cf208b4bfcbdf446ae63dcfa6435c27e56 (patch)
tree1aa446fc049e7747ed4a1e7888e05d5d78da372b /drivers/regulator
parent4175ae52e000aa5b5750f70d354c3653871d8d07 (diff)
mfd: mfd_cell is now implicitly available to ab3100 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> (cherry picked from commit 5528e40f973ac427c857593ea0f636b6f65058b0)
Diffstat (limited to 'drivers/regulator')
-rw-r--r--drivers/regulator/ab3100.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/regulator/ab3100.c b/drivers/regulator/ab3100.c
index ed6feaf9398..2dec589a890 100644
--- a/drivers/regulator/ab3100.c
+++ b/drivers/regulator/ab3100.c
@@ -17,6 +17,7 @@
#include <linux/platform_device.h>
#include <linux/regulator/driver.h>
#include <linux/mfd/abx500.h>
+#include <linux/mfd/core.h>
/* LDO registers and some handy masking definitions for AB3100 */
#define AB3100_LDO_A 0x40
@@ -576,7 +577,7 @@ ab3100_regulator_desc[AB3100_NUM_REGULATORS] = {
static int __devinit ab3100_regulators_probe(struct platform_device *pdev)
{
- struct ab3100_platform_data *plfdata = pdev->dev.platform_data;
+ struct ab3100_platform_data *plfdata = mfd_get_data(pdev);
int err = 0;
u8 data;
int i;