diff options
-rw-r--r-- | drivers/mfd/ab3100-core.c | 4 | ||||
-rw-r--r-- | drivers/regulator/ab3100.c | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/drivers/mfd/ab3100-core.c b/drivers/mfd/ab3100-core.c index 1707d224232d..2dcab8643e71 100644 --- a/drivers/mfd/ab3100-core.c +++ b/drivers/mfd/ab3100-core.c | |||
@@ -949,10 +949,8 @@ static int __devinit ab3100_probe(struct i2c_client *client, | |||
949 | goto exit_no_ops; | 949 | goto exit_no_ops; |
950 | 950 | ||
951 | /* Set up and register the platform devices. */ | 951 | /* Set up and register the platform devices. */ |
952 | for (i = 0; i < ARRAY_SIZE(ab3100_devs); i++) { | 952 | for (i = 0; i < ARRAY_SIZE(ab3100_devs); i++) |
953 | ab3100_devs[i].platform_data = ab3100_plf_data; | 953 | ab3100_devs[i].platform_data = ab3100_plf_data; |
954 | ab3100_devs[i].data_size = sizeof(struct ab3100_platform_data); | ||
955 | } | ||
956 | 954 | ||
957 | err = mfd_add_devices(&client->dev, 0, ab3100_devs, | 955 | err = mfd_add_devices(&client->dev, 0, ab3100_devs, |
958 | ARRAY_SIZE(ab3100_devs), NULL, 0); | 956 | ARRAY_SIZE(ab3100_devs), NULL, 0); |
diff --git a/drivers/regulator/ab3100.c b/drivers/regulator/ab3100.c index ed6feaf9398d..2dec589a8908 100644 --- a/drivers/regulator/ab3100.c +++ b/drivers/regulator/ab3100.c | |||
@@ -17,6 +17,7 @@ | |||
17 | #include <linux/platform_device.h> | 17 | #include <linux/platform_device.h> |
18 | #include <linux/regulator/driver.h> | 18 | #include <linux/regulator/driver.h> |
19 | #include <linux/mfd/abx500.h> | 19 | #include <linux/mfd/abx500.h> |
20 | #include <linux/mfd/core.h> | ||
20 | 21 | ||
21 | /* LDO registers and some handy masking definitions for AB3100 */ | 22 | /* LDO registers and some handy masking definitions for AB3100 */ |
22 | #define AB3100_LDO_A 0x40 | 23 | #define AB3100_LDO_A 0x40 |
@@ -576,7 +577,7 @@ ab3100_regulator_desc[AB3100_NUM_REGULATORS] = { | |||
576 | 577 | ||
577 | static int __devinit ab3100_regulators_probe(struct platform_device *pdev) | 578 | static int __devinit ab3100_regulators_probe(struct platform_device *pdev) |
578 | { | 579 | { |
579 | struct ab3100_platform_data *plfdata = pdev->dev.platform_data; | 580 | struct ab3100_platform_data *plfdata = mfd_get_data(pdev); |
580 | int err = 0; | 581 | int err = 0; |
581 | u8 data; | 582 | u8 data; |
582 | int i; | 583 | int i; |