diff options
| author | Takashi Iwai <tiwai@suse.de> | 2005-11-17 15:55:49 +0100 |
|---|---|---|
| committer | Jaroslav Kysela <perex@suse.cz> | 2006-01-03 12:20:19 +0100 |
| commit | a381a7a66486f11606eccb8866e29848f995278f (patch) | |
| tree | 4fcc2f971a1f0d509939181b91096a600454b0d6 /sound/core/sound.c | |
| parent | fd66e0d0591dd12eb0bea1e9f3aa194bb93cebbd (diff) | |
[ALSA] Decentralize PM control
Modules: ALSA Core,Control Midlevel,/oss/Makefile
Remove the centralized PM control in the sound core.
Each driver is responsible to get callbacks from bus/driver now.
SND_GENERIC_DRIVER is removed together with this action.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/core/sound.c')
| -rw-r--r-- | sound/core/sound.c | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/sound/core/sound.c b/sound/core/sound.c index 04de0084e42a..fb236a6b9c34 100644 --- a/sound/core/sound.c +++ b/sound/core/sound.c @@ -32,7 +32,6 @@ #include <sound/initval.h> #include <linux/kmod.h> #include <linux/devfs_fs_kernel.h> -#include <linux/platform_device.h> #define SNDRV_OS_MINORS 256 @@ -328,10 +327,6 @@ int __exit snd_minor_info_done(void) * INIT PART */ -#ifdef CONFIG_SND_GENERIC_DRIVER -extern struct platform_driver snd_generic_driver; -#endif - static int __init alsa_sound_init(void) { short controlnum; @@ -356,9 +351,6 @@ static int __init alsa_sound_init(void) return -ENOMEM; } snd_info_minor_register(); -#ifdef CONFIG_SND_GENERIC_DRIVER - platform_driver_register(&snd_generic_driver); -#endif for (controlnum = 0; controlnum < cards_limit; controlnum++) devfs_mk_cdev(MKDEV(major, controlnum<<5), S_IFCHR | device_mode, "snd/controlC%d", controlnum); #ifndef MODULE @@ -374,9 +366,6 @@ static void __exit alsa_sound_exit(void) for (controlnum = 0; controlnum < cards_limit; controlnum++) devfs_remove("snd/controlC%d", controlnum); -#ifdef CONFIG_SND_GENERIC_DRIVER - platform_driver_unregister(&snd_generic_driver); -#endif snd_info_minor_unregister(); snd_info_done(); if (unregister_chrdev(major, "alsa") != 0) @@ -415,19 +404,8 @@ EXPORT_SYMBOL(snd_card_register); EXPORT_SYMBOL(snd_component_add); EXPORT_SYMBOL(snd_card_file_add); EXPORT_SYMBOL(snd_card_file_remove); -#ifdef CONFIG_SND_GENERIC_DRIVER -EXPORT_SYMBOL(snd_card_set_generic_dev); -#endif #ifdef CONFIG_PM EXPORT_SYMBOL(snd_power_wait); -EXPORT_SYMBOL(snd_card_set_pm_callback); -#ifdef CONFIG_SND_GENERIC_DRIVER -EXPORT_SYMBOL(snd_card_set_generic_pm_callback); -#endif -#ifdef CONFIG_PCI -EXPORT_SYMBOL(snd_card_pci_suspend); -EXPORT_SYMBOL(snd_card_pci_resume); -#endif #endif /* device.c */ EXPORT_SYMBOL(snd_device_new); |