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>

diff --git a/drivers/mfd/mfd-core.c b/drivers/mfd/mfd-core.c
index 21a39dc64ea0dc00e25d14b7abb4783eecab4819..01115f686dfad934ed483bcff06c95a091e08794 100644 (file)
--- 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 f317fe4f83667b039db89ca21b6fefbd0c27f3c5..71cd1f983cce7b954c36d124124c957feb78c1d6 100644 (file)
--- 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;