summaryrefslogtreecommitdiff
path: root/sound/soc/fsl/mpc8610_hpcd.c
diff options
context:
space:
mode:
authorTimur Tabi <timur@freescale.com>2010-08-20 00:26:58 +0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-08-20 20:19:44 +0400
commit38fec7272bc033b75a0eb8976c56c2024d371b7d (patch)
treeedde947e89e821a1f66440cf8d82d8e73475c1ab /sound/soc/fsl/mpc8610_hpcd.c
parentbf557a50f59fc62dfd89fa5bf08c6f5d96fb2f45 (diff)
downloadlinux-38fec7272bc033b75a0eb8976c56c2024d371b7d.tar.xz
ASoC: mpc8610: replace of_device with platform_device
'struct of_device' no longer exists, and its functionality has been merged into platform_device. Update the MPC8610 HPCD audio drivers (fsl_ssi, fsl_dma, and mpc8610_hpcd) accordingly. Also add a #include for slab.h, which is now needed for kmalloc and kfree. Signed-off-by: Timur Tabi <timur@freescale.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/fsl/mpc8610_hpcd.c')
-rw-r--r--sound/soc/fsl/mpc8610_hpcd.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/sound/soc/fsl/mpc8610_hpcd.c b/sound/soc/fsl/mpc8610_hpcd.c
index 38339c158ed9..0d7dcf1e4863 100644
--- 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 */