2 files changed, 2 insertions, 13 deletions

diff --git a/drivers/mfd/pcf50633-adc.c b/drivers/mfd/pcf50633-adc.c
index 3d31e97d6a45..6d2e8466df1d 100644
--- a/drivers/mfd/pcf50633-adc.c
+++ b/drivers/mfd/pcf50633-adc.c
@@ -209,17 +209,16 @@ static void pcf50633_adc_irq(int irq, void *data)
 
 static int __devinit pcf50633_adc_probe(struct platform_device *pdev)
 {
-        struct pcf50633_subdev_pdata *pdata = pdev->dev.platform_data;
         struct pcf50633_adc *adc;
 
         adc = kzalloc(sizeof(*adc), GFP_KERNEL);
         if (!adc)
                 return -ENOMEM;
 
-        adc->pcf = pdata->pcf;
+        adc->pcf = dev_to_pcf50633(pdev->dev.parent);
         platform_set_drvdata(pdev, adc);
 
-        pcf50633_register_irq(pdata->pcf, PCF50633_IRQ_ADCRDY,
+        pcf50633_register_irq(adc->pcf, PCF50633_IRQ_ADCRDY,
                                         pcf50633_adc_irq, adc);
 
         mutex_init(&adc->queue_mutex);
diff --git a/drivers/mfd/pcf50633-core.c b/drivers/mfd/pcf50633-core.c
index 48776d3018ed..69cdbdcd2e82 100644
--- a/drivers/mfd/pcf50633-core.c
+++ b/drivers/mfd/pcf50633-core.c
@@ -456,7 +456,6 @@ static void
 pcf50633_client_dev_register(struct pcf50633 *pcf, const char *name,
                                                 struct platform_device **pdev)
 {
-        struct pcf50633_subdev_pdata *subdev_pdata;
         int ret;
 
         *pdev = platform_device_alloc(name, -1);
@@ -465,15 +464,6 @@ pcf50633_client_dev_register(struct pcf50633 *pcf, const char *name,
                 return;
         }
 
-        subdev_pdata = kmalloc(sizeof(*subdev_pdata), GFP_KERNEL);
-        if (!subdev_pdata) {
-                dev_err(pcf->dev, "Error allocating subdev pdata\n");
-                platform_device_put(*pdev);
-        }
-
-        subdev_pdata->pcf = pcf;
-        platform_device_add_data(*pdev, subdev_pdata, sizeof(*subdev_pdata));
-
         (*pdev)->dev.parent = pcf->dev;
 
         ret = platform_device_add(*pdev);