ASoC: mpc8610: replace of_device with platform_device

[deliverable/linux.git] / sound / soc / fsl / mpc8610_hpcd.c

diff --git a/sound/soc/fsl/mpc8610_hpcd.c b/sound/soc/fsl/mpc8610_hpcd.c
index 38339c158ed94678377f08e2ae1a9e6dea59c9c5..0d7dcf1e4863592c439a626b7fe449b56669f45d 100644 (file)
--- a/sound/soc/fsl/mpc8610_hpcd.c
+++ b/sound/soc/fsl/mpc8610_hpcd.c
@@ -13,6 +13,7 @@
 #include <linux/module.h>
 #include <linux/interrupt.h>
 #include <linux/of_device.h>
+#include <linux/slab.h>
 #include <sound/soc.h>
 #include <asm/fsl_guts.h>
 
@@ -323,9 +324,10 @@ static int get_dma_channel(struct device_node *ssi_np,
 static int mpc8610_hpcd_probe(struct platform_device *pdev)
 {
        struct device *dev = pdev->dev.parent;
-       /* of_dev is the OF device for the SSI node that probed us */
-       struct of_device *of_dev = container_of(dev, struct of_device, dev);
-       struct device_node *np = of_dev->dev.of_node;
+       /* ssi_pdev is the platform device for the SSI node that probed us */
+       struct platform_device *ssi_pdev =
+               container_of(dev, struct platform_device, dev);
+       struct device_node *np = ssi_pdev->dev.of_node;
        struct device_node *codec_np = NULL;
        struct platform_device *sound_device = NULL;
        struct mpc8610_hpcd_data *machine_data;
@@ -348,7 +350,7 @@ static int mpc8610_hpcd_probe(struct platform_device *pdev)
        if (!machine_data)
                return -ENOMEM;
 
-       machine_data->dai[0].cpu_dai_name = dev_name(&of_dev->dev);
+       machine_data->dai[0].cpu_dai_name = dev_name(&ssi_pdev->dev);
        machine_data->dai[0].ops = &mpc8610_hpcd_ops;
 
        /* Determine the codec name, it will be used as the codec DAI name */