aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/mfd/mfd-core.c1
-rw-r--r--include/linux/mfd/core.h3
2 files changed, 0 insertions, 4 deletions
diff --git a/drivers/mfd/mfd-core.c b/drivers/mfd/mfd-core.c
index 21a39dc64ea0..01115f686dfa 100644
--- a/drivers/mfd/mfd-core.c
+++ b/drivers/mfd/mfd-core.c
@@ -37,7 +37,6 @@ static int mfd_add_device(struct device *parent, int id,
37 goto fail_device; 37 goto fail_device;
38 38
39 pdev->dev.parent = parent; 39 pdev->dev.parent = parent;
40 platform_set_drvdata(pdev, cell->driver_data);
41 40
42 ret = platform_device_add_data(pdev, cell, sizeof(*cell)); 41 ret = platform_device_add_data(pdev, cell, sizeof(*cell));
43 if (ret) 42 if (ret)
diff --git a/include/linux/mfd/core.h b/include/linux/mfd/core.h
index f317fe4f8366..71cd1f983cce 100644
--- a/include/linux/mfd/core.h
+++ b/include/linux/mfd/core.h
@@ -30,9 +30,6 @@ struct mfd_cell {
30 int (*suspend)(struct platform_device *dev); 30 int (*suspend)(struct platform_device *dev);
31 int (*resume)(struct platform_device *dev); 31 int (*resume)(struct platform_device *dev);
32 32
33 /* driver-specific data for MFD-aware "cell" drivers */
34 void *driver_data;
35
36 /* mfd_data can be used to pass data to client drivers */ 33 /* mfd_data can be used to pass data to client drivers */
37 void *mfd_data; 34 void *mfd_data;
38 35