aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/au1x
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2008-12-03 14:26:35 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2008-12-09 05:49:27 -0500
commit3f4b783cfdebb559814690572041a17bc9744cf3 (patch)
treeb390f3ad74fe3f9d9e2144fc1f0f120af0705412 /sound/soc/au1x
parent9115171a6b79b6b4d5c6697f123556b6efc37f1f (diff)
ASoC: Register platform DAIs
Register all platform DAIs with the core. In line with current behaviour this is done at module probe time rather than when the devices are probed (since currently that only happens as the entire ASoC card is registered except for those drivers that currently implement some kind of hotplug). Since the core currently ignores DAI registration this has no practical effect. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/au1x')
-rw-r--r--sound/soc/au1x/psc-ac97.c3
-rw-r--r--sound/soc/au1x/psc-i2s.c3
2 files changed, 4 insertions, 2 deletions
diff --git a/sound/soc/au1x/psc-ac97.c b/sound/soc/au1x/psc-ac97.c
index a1e824d29cf9..f0e30aec7f23 100644
--- a/sound/soc/au1x/psc-ac97.c
+++ b/sound/soc/au1x/psc-ac97.c
@@ -371,11 +371,12 @@ EXPORT_SYMBOL_GPL(au1xpsc_ac97_dai);
371static int __init au1xpsc_ac97_init(void) 371static int __init au1xpsc_ac97_init(void)
372{ 372{
373 au1xpsc_ac97_workdata = NULL; 373 au1xpsc_ac97_workdata = NULL;
374 return 0; 374 return snd_soc_register_dai(&au1xpsc_ac97_dai);
375} 375}
376 376
377static void __exit au1xpsc_ac97_exit(void) 377static void __exit au1xpsc_ac97_exit(void)
378{ 378{
379 snd_soc_unregister_dai(&au1xpsc_ac97_dai);
379} 380}
380 381
381module_init(au1xpsc_ac97_init); 382module_init(au1xpsc_ac97_init);
diff --git a/sound/soc/au1x/psc-i2s.c b/sound/soc/au1x/psc-i2s.c
index 16f97462ea15..f916de4400ed 100644
--- a/sound/soc/au1x/psc-i2s.c
+++ b/sound/soc/au1x/psc-i2s.c
@@ -396,11 +396,12 @@ EXPORT_SYMBOL(au1xpsc_i2s_dai);
396static int __init au1xpsc_i2s_init(void) 396static int __init au1xpsc_i2s_init(void)
397{ 397{
398 au1xpsc_i2s_workdata = NULL; 398 au1xpsc_i2s_workdata = NULL;
399 return 0; 399 return snd_soc_register_dai(&au1xpsc_i2s_dai);
400} 400}
401 401
402static void __exit au1xpsc_i2s_exit(void) 402static void __exit au1xpsc_i2s_exit(void)
403{ 403{
404 snd_soc_unregister_dai(&au1xpsc_i2s_dai);
404} 405}
405 406
406module_init(au1xpsc_i2s_init); 407module_init(au1xpsc_i2s_init);