1 files changed, 4 insertions, 9 deletions

diff --git a/drivers/w1/masters/ds1wm.c b/drivers/w1/masters/ds1wm.c
index 6b85e7fefa43..95921b77cf86 100644
--- a/drivers/w1/masters/ds1wm.c
+++ b/drivers/w1/masters/ds1wm.c
@@ -90,7 +90,7 @@ struct ds1wm_data {
         void            __iomem *map;
         int             bus_shift; /* # of shifts to calc register offsets */
         struct platform_device *pdev;
-        struct mfd_cell *cell;
+        const struct mfd_cell *cell;
         int             irq;
         int             active_high;
         int             slave_present;
@@ -216,7 +216,7 @@ static int ds1wm_find_divisor(int gclk)
 static void ds1wm_up(struct ds1wm_data *ds1wm_data)
 {
         int divisor;
-        struct ds1wm_driver_data *plat = ds1wm_data->cell->driver_data;
+        struct ds1wm_driver_data *plat = mfd_get_data(ds1wm_data->pdev);
 
         if (ds1wm_data->cell->enable)
                 ds1wm_data->cell->enable(ds1wm_data->pdev);
@@ -330,16 +330,11 @@ static int ds1wm_probe(struct platform_device *pdev)
         struct ds1wm_data *ds1wm_data;
         struct ds1wm_driver_data *plat;
         struct resource *res;
-        struct mfd_cell *cell;
         int ret;
 
         if (!pdev)
                 return -ENODEV;
 
-        cell = pdev->dev.platform_data;
-        if (!cell)
-                return -ENODEV;
-
         ds1wm_data = kzalloc(sizeof(*ds1wm_data), GFP_KERNEL);
         if (!ds1wm_data)
                 return -ENOMEM;
@@ -356,13 +351,13 @@ static int ds1wm_probe(struct platform_device *pdev)
                 ret = -ENOMEM;
                 goto err0;
         }
-        plat = cell->driver_data;
+        plat = mfd_get_data(pdev);
 
         /* calculate bus shift from mem resource */
         ds1wm_data->bus_shift = resource_size(res) >> 3;
 
         ds1wm_data->pdev = pdev;
-        ds1wm_data->cell = cell;
+        ds1wm_data->cell = mfd_get_cell(pdev);
 
         res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
         if (!res) {