瀏覽代碼

mfd: mfd_cell is now implicitly available to ab3550 driver

No clients (in mainline kernel, I'm told that drivers exist in external
trees that are planned for mainline inclusion) make use of this, nor
do they make use of platform_data, so nothing really had to change here.

The .data_size field is unused, so its usage gets removed.

Signed-off-by: Andres Salomon <dilinger@queued.net>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Andres Salomon 14 年之前
父節點
當前提交
0ce5fabe59
共有 2 個文件被更改,包括 1 次插入4 次删除
  1. 1 3
      drivers/mfd/ab3550-core.c
  2. 0 1
      include/linux/mfd/abx500.h

+ 1 - 3
drivers/mfd/ab3550-core.c

@@ -1320,10 +1320,8 @@ static int __init ab3550_probe(struct i2c_client *client,
 		goto exit_no_ops;
 		goto exit_no_ops;
 
 
 	/* Set up and register the platform devices. */
 	/* Set up and register the platform devices. */
-	for (i = 0; i < AB3550_NUM_DEVICES; i++) {
+	for (i = 0; i < AB3550_NUM_DEVICES; i++)
 		ab3550_devs[i].platform_data = ab3550_plf_data->dev_data[i];
 		ab3550_devs[i].platform_data = ab3550_plf_data->dev_data[i];
-		ab3550_devs[i].data_size = ab3550_plf_data->dev_data_sz[i];
-	}
 
 
 	err = mfd_add_devices(&client->dev, 0, ab3550_devs,
 	err = mfd_add_devices(&client->dev, 0, ab3550_devs,
 		ARRAY_SIZE(ab3550_devs), NULL,
 		ARRAY_SIZE(ab3550_devs), NULL,

+ 0 - 1
include/linux/mfd/abx500.h

@@ -186,7 +186,6 @@ struct abx500_init_settings {
 struct ab3550_platform_data {
 struct ab3550_platform_data {
 	struct {unsigned int base; unsigned int count; } irq;
 	struct {unsigned int base; unsigned int count; } irq;
 	void *dev_data[AB3550_NUM_DEVICES];
 	void *dev_data[AB3550_NUM_DEVICES];
-	size_t dev_data_sz[AB3550_NUM_DEVICES];
 	struct abx500_init_settings *init_settings;
 	struct abx500_init_settings *init_settings;
 	unsigned int init_settings_sz;
 	unsigned int init_settings_sz;
 };
 };