aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndres Salomon <dilinger@queued.net>2011-02-17 19:07:33 -0800
committerSamuel Ortiz <sameo@linux.intel.com>2011-03-23 10:41:58 +0100
commitdcb50e83bb86d66d3554ba9c365488669c84d037 (patch)
treef68f77e3ae61325e3a2e3a46cd5cf30ac67a136c
parent46673ed2cdca85afa7c69d126e3778bba2dbd2d5 (diff)
downloadkernel_samsung_smdk4412-dcb50e83bb86d66d3554ba9c365488669c84d037.zip
kernel_samsung_smdk4412-dcb50e83bb86d66d3554ba9c365488669c84d037.tar.gz
kernel_samsung_smdk4412-dcb50e83bb86d66d3554ba9c365488669c84d037.tar.bz2
mfd: Remove driver_data field from mfd_cell
All users of this have now been switched over to using mfd_data; it can go away now. Signed-off-by: Andres Salomon <dilinger@queued.net> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
-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 21a39dc..01115f6 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,
goto fail_device;
pdev->dev.parent = parent;
- platform_set_drvdata(pdev, cell->driver_data);
ret = platform_device_add_data(pdev, cell, sizeof(*cell));
if (ret)
diff --git a/include/linux/mfd/core.h b/include/linux/mfd/core.h
index f317fe4..71cd1f9 100644
--- a/include/linux/mfd/core.h
+++ b/include/linux/mfd/core.h
@@ -30,9 +30,6 @@ struct mfd_cell {
int (*suspend)(struct platform_device *dev);
int (*resume)(struct platform_device *dev);
- /* driver-specific data for MFD-aware "cell" drivers */
- void *driver_data;
-
/* mfd_data can be used to pass data to client drivers */
void *mfd_data;