diff options
| author | Timur Tabi <timur@freescale.com> | 2011-08-23 16:48:26 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-10-03 11:40:23 -0700 |
| commit | 9f89c9607925aabb7352a3f50b69c7bfdb2c1cbb (patch) | |
| tree | d6efb6b5effb67c5c74ab28e964503a28da36856 /sound | |
| parent | f3919ef81224e33c867882453cd33036ac0ed7ee (diff) | |
| download | kernel_samsung_crespo-9f89c9607925aabb7352a3f50b69c7bfdb2c1cbb.zip kernel_samsung_crespo-9f89c9607925aabb7352a3f50b69c7bfdb2c1cbb.tar.gz kernel_samsung_crespo-9f89c9607925aabb7352a3f50b69c7bfdb2c1cbb.tar.bz2 | |
ASoC: MPC5200: replace of_device with platform_device
commit 3bdf28feafc52864bd7f17b39deec64833a89d19 upstream.
'struct of_device' no longer exists, and its functionality has been merged
into platform_device. Update the MPC5200 audio DMA driver (mpc5200_dma)
accordingly. This fixes a build break.
Signed-off-by: Timur Tabi <timur@freescale.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/fsl/mpc5200_dma.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/fsl/mpc5200_dma.c b/sound/soc/fsl/mpc5200_dma.c index fff695c..cbaf8b7 100644 --- a/sound/soc/fsl/mpc5200_dma.c +++ b/sound/soc/fsl/mpc5200_dma.c @@ -368,7 +368,7 @@ static struct snd_soc_platform_driver mpc5200_audio_dma_platform = { .pcm_free = &psc_dma_free, }; -static int mpc5200_hpcd_probe(struct of_device *op) +static int mpc5200_hpcd_probe(struct platform_device *op) { phys_addr_t fifo; struct psc_dma *psc_dma; @@ -486,7 +486,7 @@ out_unmap: return ret; } -static int mpc5200_hpcd_remove(struct of_device *op) +static int mpc5200_hpcd_remove(struct platform_device *op) { struct psc_dma *psc_dma = dev_get_drvdata(&op->dev); @@ -518,7 +518,7 @@ MODULE_DEVICE_TABLE(of, mpc5200_hpcd_match); static struct platform_driver mpc5200_hpcd_of_driver = { .probe = mpc5200_hpcd_probe, .remove = mpc5200_hpcd_remove, - .dev = { + .driver = { .owner = THIS_MODULE, .name = "mpc5200-pcm-audio", .of_match_table = mpc5200_hpcd_match, |