diff options
| author | Hebbar, Gururaja <gururaja.hebbar@ti.com> | 2012-08-27 09:26:39 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-08-27 14:12:08 -0400 |
| commit | f08095a408bf6489b4a710d794ae6d5475a007ef (patch) | |
| tree | 8ca802466c185cee5d9e371501781660903f19e9 /sound/soc/davinci/davinci-vcif.c | |
| parent | c24fdc886fde9ce7bda8115b9c2b338818796c65 (diff) | |
ASoC: davinci: davinci-pcm does not need to be a plaform_driver
Same as the commit 518de86 (ASoC: tegra: register 'platform' from DAIs,
get rid of pdev). It makes davinci-pcm not a platform_driver but helper
to register "platform", so that the platform_device for davinci-pcm can
be saved completely.
Signed-off-by: Hebbar, Gururaja <gururaja.hebbar@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/davinci/davinci-vcif.c')
| -rw-r--r-- | sound/soc/davinci/davinci-vcif.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sound/soc/davinci/davinci-vcif.c b/sound/soc/davinci/davinci-vcif.c index da030ff883d..07bde2e6f84 100644 --- a/sound/soc/davinci/davinci-vcif.c +++ b/sound/soc/davinci/davinci-vcif.c | |||
| @@ -240,12 +240,20 @@ static int davinci_vcif_probe(struct platform_device *pdev) | |||
| 240 | return ret; | 240 | return ret; |
| 241 | } | 241 | } |
| 242 | 242 | ||
| 243 | ret = davinci_soc_platform_register(&pdev->dev); | ||
| 244 | if (ret) { | ||
| 245 | dev_err(&pdev->dev, "register PCM failed: %d\n", ret); | ||
| 246 | snd_soc_unregister_dai(&pdev->dev); | ||
| 247 | return ret; | ||
| 248 | } | ||
| 249 | |||
| 243 | return 0; | 250 | return 0; |
| 244 | } | 251 | } |
| 245 | 252 | ||
| 246 | static int davinci_vcif_remove(struct platform_device *pdev) | 253 | static int davinci_vcif_remove(struct platform_device *pdev) |
| 247 | { | 254 | { |
| 248 | snd_soc_unregister_dai(&pdev->dev); | 255 | snd_soc_unregister_dai(&pdev->dev); |
| 256 | davinci_soc_platform_unregister(&pdev->dev); | ||
| 249 | 257 | ||
| 250 | return 0; | 258 | return 0; |
| 251 | } | 259 | } |