diff options
| author | Padmavathi Venna <padma.v@samsung.com> | 2012-12-07 12:29:21 +0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-07 14:36:07 +0400 |
| commit | a08485d8fdf6f67ca5f173b68d8f873c574745f2 (patch) | |
| tree | fac9dbea634fef912a5e74434110ad769b8c963f /sound/soc/samsung/spdif.c | |
| parent | 1974a042dd15f1f007a3a1a2dd7a23ca0e42c01d (diff) | |
| download | linux-a08485d8fdf6f67ca5f173b68d8f873c574745f2.tar.xz | |
ASoC: Samsung: Do not register samsung audio dma device as pdev
Previously, the ASoC 'platform' (PCM/DMA) object was instantiated via a
platform_device. This didn't represent the hardware well, since there
was no separate hardware associated with this platform_device; it was a
virtual device with sole purpose to call snd_soc_register_platform().
This change removes the platform_device completely. Each Samsung DAI now
registers the ASoC 'platform' itself. Machine drivers are adjusted for
the new 'platform' name.
Signed-off-by: Padmavathi Venna <padma.v@samsung.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/samsung/spdif.c')
| -rw-r--r-- | sound/soc/samsung/spdif.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/sound/soc/samsung/spdif.c b/sound/soc/samsung/spdif.c index 5f3b06d36e9c..8606fc6cb37d 100644 --- a/sound/soc/samsung/spdif.c +++ b/sound/soc/samsung/spdif.c @@ -437,8 +437,15 @@ static __devinit int spdif_probe(struct platform_device *pdev) spdif->dma_playback = &spdif_stereo_out; - return 0; + ret = asoc_dma_platform_register(&pdev->dev); + if (ret) { + dev_err(&pdev->dev, "failed to register DMA: %d\n", ret); + goto err5; + } + return 0; +err5: + snd_soc_unregister_dai(&pdev->dev); err4: iounmap(spdif->regs); err3: @@ -458,6 +465,7 @@ static __devexit int spdif_remove(struct platform_device *pdev) struct samsung_spdif_info *spdif = &spdif_info; struct resource *mem_res; + asoc_dma_platform_unregister(&pdev->dev); snd_soc_unregister_dai(&pdev->dev); iounmap(spdif->regs); |