1 files changed, 3 insertions, 22 deletions

diff --git a/drivers/mfd/tc6393xb.c b/drivers/mfd/tc6393xb.c
index 9a238633a54d..3d62ded86a8f 100644
--- a/drivers/mfd/tc6393xb.c
+++ b/drivers/mfd/tc6393xb.c
@@ -393,7 +393,7 @@ static struct mfd_cell __devinitdata tc6393xb_cells[] = {
                 .name = "tmio-mmc",
                 .enable = tc6393xb_mmc_enable,
                 .resume = tc6393xb_mmc_resume,
-                .driver_data = &tc6393xb_mmc_data,
+                .mfd_data = &tc6393xb_mmc_data,
                 .num_resources = ARRAY_SIZE(tc6393xb_mmc_resources),
                 .resources = tc6393xb_mmc_resources,
         },
@@ -693,27 +693,8 @@ static int __devinit tc6393xb_probe(struct platform_device *dev)
                         goto err_setup;
         }
 
-        tc6393xb_cells[TC6393XB_CELL_NAND].driver_data = tcpd->nand_data;
-        tc6393xb_cells[TC6393XB_CELL_NAND].platform_data =
-                &tc6393xb_cells[TC6393XB_CELL_NAND];
-        tc6393xb_cells[TC6393XB_CELL_NAND].data_size =
-                sizeof(tc6393xb_cells[TC6393XB_CELL_NAND]);
-
-        tc6393xb_cells[TC6393XB_CELL_MMC].platform_data =
-                &tc6393xb_cells[TC6393XB_CELL_MMC];
-        tc6393xb_cells[TC6393XB_CELL_MMC].data_size =
-                sizeof(tc6393xb_cells[TC6393XB_CELL_MMC]);
-
-        tc6393xb_cells[TC6393XB_CELL_OHCI].platform_data =
-                &tc6393xb_cells[TC6393XB_CELL_OHCI];
-        tc6393xb_cells[TC6393XB_CELL_OHCI].data_size =
-                sizeof(tc6393xb_cells[TC6393XB_CELL_OHCI]);
-
-        tc6393xb_cells[TC6393XB_CELL_FB].driver_data = tcpd->fb_data;
-        tc6393xb_cells[TC6393XB_CELL_FB].platform_data =
-                &tc6393xb_cells[TC6393XB_CELL_FB];
-        tc6393xb_cells[TC6393XB_CELL_FB].data_size =
-                sizeof(tc6393xb_cells[TC6393XB_CELL_FB]);
+        tc6393xb_cells[TC6393XB_CELL_NAND].mfd_data = tcpd->nand_data;
+        tc6393xb_cells[TC6393XB_CELL_FB].mfd_data = tcpd->fb_data;
 
         ret = mfd_add_devices(&dev->dev, dev->id,
                         tc6393xb_cells, ARRAY_SIZE(tc6393xb_cells),