diff options
-rw-r--r-- | drivers/mfd/ab3550-core.c | 4 | ||||
-rw-r--r-- | include/linux/mfd/abx500.h | 1 |
2 files changed, 1 insertions, 4 deletions
diff --git a/drivers/mfd/ab3550-core.c b/drivers/mfd/ab3550-core.c index 681984df1c2..c8e555a9ee6 100644 --- a/drivers/mfd/ab3550-core.c +++ b/drivers/mfd/ab3550-core.c | |||
@@ -1320,10 +1320,8 @@ static int __init ab3550_probe(struct i2c_client *client, | |||
1320 | goto exit_no_ops; | 1320 | goto exit_no_ops; |
1321 | 1321 | ||
1322 | /* Set up and register the platform devices. */ | 1322 | /* Set up and register the platform devices. */ |
1323 | for (i = 0; i < AB3550_NUM_DEVICES; i++) { | 1323 | for (i = 0; i < AB3550_NUM_DEVICES; i++) |
1324 | ab3550_devs[i].platform_data = ab3550_plf_data->dev_data[i]; | 1324 | ab3550_devs[i].platform_data = ab3550_plf_data->dev_data[i]; |
1325 | ab3550_devs[i].data_size = ab3550_plf_data->dev_data_sz[i]; | ||
1326 | } | ||
1327 | 1325 | ||
1328 | err = mfd_add_devices(&client->dev, 0, ab3550_devs, | 1326 | err = mfd_add_devices(&client->dev, 0, ab3550_devs, |
1329 | ARRAY_SIZE(ab3550_devs), NULL, | 1327 | ARRAY_SIZE(ab3550_devs), NULL, |
diff --git a/include/linux/mfd/abx500.h b/include/linux/mfd/abx500.h index 67bd6f7ecf3..7d9b6ae1c20 100644 --- a/include/linux/mfd/abx500.h +++ b/include/linux/mfd/abx500.h | |||
@@ -186,7 +186,6 @@ struct abx500_init_settings { | |||
186 | struct ab3550_platform_data { | 186 | struct ab3550_platform_data { |
187 | struct {unsigned int base; unsigned int count; } irq; | 187 | struct {unsigned int base; unsigned int count; } irq; |
188 | void *dev_data[AB3550_NUM_DEVICES]; | 188 | void *dev_data[AB3550_NUM_DEVICES]; |
189 | size_t dev_data_sz[AB3550_NUM_DEVICES]; | ||
190 | struct abx500_init_settings *init_settings; | 189 | struct abx500_init_settings *init_settings; |
191 | unsigned int init_settings_sz; | 190 | unsigned int init_settings_sz; |
192 | }; | 191 | }; |