1 files changed, 2 insertions, 8 deletions

diff --git a/drivers/mfd/asic3.c b/drivers/mfd/asic3.c
index c45e6305b26..0241f08fc00 100644
--- a/drivers/mfd/asic3.c
+++ b/drivers/mfd/asic3.c
@@ -682,7 +682,7 @@ static struct mfd_cell asic3_cell_ds1wm = {
         .name          = "ds1wm",
         .enable        = ds1wm_enable,
         .disable       = ds1wm_disable,
-        .driver_data   = &ds1wm_pdata,
+        .mfd_data      = &ds1wm_pdata,
         .num_resources = ARRAY_SIZE(ds1wm_resources),
         .resources     = ds1wm_resources,
 };
@@ -783,7 +783,7 @@ static struct mfd_cell asic3_cell_mmc = {
         .name          = "tmio-mmc",
         .enable        = asic3_mmc_enable,
         .disable       = asic3_mmc_disable,
-        .driver_data   = &asic3_mmc_data,
+        .mfd_data      = &asic3_mmc_data,
         .num_resources = ARRAY_SIZE(asic3_mmc_resources),
         .resources     = asic3_mmc_resources,
 };
@@ -810,9 +810,6 @@ static int __init asic3_mfd_probe(struct platform_device *pdev,
         ds1wm_resources[0].start >>= asic->bus_shift;
         ds1wm_resources[0].end   >>= asic->bus_shift;
 
-        asic3_cell_ds1wm.platform_data = &asic3_cell_ds1wm;
-        asic3_cell_ds1wm.data_size = sizeof(asic3_cell_ds1wm);
-
         /* MMC */
         asic->tmio_cnf = ioremap((ASIC3_SD_CONFIG_BASE >> asic->bus_shift) +
                                  mem_sdio->start, 0x400 >> asic->bus_shift);
@@ -824,9 +821,6 @@ static int __init asic3_mfd_probe(struct platform_device *pdev,
         asic3_mmc_resources[0].start >>= asic->bus_shift;
         asic3_mmc_resources[0].end   >>= asic->bus_shift;
 
-        asic3_cell_mmc.platform_data = &asic3_cell_mmc;
-        asic3_cell_mmc.data_size = sizeof(asic3_cell_mmc);
-
         ret = mfd_add_devices(&pdev->dev, pdev->id,
                         &asic3_cell_ds1wm, 1, mem, asic->irq_base);
         if (ret < 0)