ALSA: core: Remove superfluous exit calls for proc entries

[pandora-kernel.git] / sound / core / init.c

diff --git a/sound/core/init.c b/sound/core/init.c
index 3541905..0af34fa 100644 (file)
--- a/sound/core/init.c
+++ b/sound/core/init.c
@@ -400,7 +400,6 @@ static const struct file_operations snd_shutdown_f_ops =
 int snd_card_disconnect(struct snd_card *card)
 {
        struct snd_monitor_file *mfile;
-       int err;
 
        if (!card)
                return -EINVAL;
@@ -445,9 +444,7 @@ int snd_card_disconnect(struct snd_card *card)
 #endif
 
        /* notify all devices that we are disconnected */
-       err = snd_device_disconnect_all(card);
-       if (err < 0)
-               dev_err(card->dev, "not all devices for card %i can be disconnected\n", card->number);
+       snd_device_disconnect_all(card);
 
        snd_info_card_disconnect(card);
        if (card->registered) {
@@ -786,8 +783,6 @@ int snd_card_register(struct snd_card *card)
 EXPORT_SYMBOL(snd_card_register);
 
 #ifdef CONFIG_PROC_FS
-static struct snd_info_entry *snd_card_info_entry;
-
 static void snd_card_info_read(struct snd_info_entry *entry,
                               struct snd_info_buffer *buffer)
 {
@@ -813,7 +808,6 @@ static void snd_card_info_read(struct snd_info_entry *entry,
 }
 
 #ifdef CONFIG_SND_OSSEMUL
-
 void snd_card_info_read_oss(struct snd_info_buffer *buffer)
 {
        int idx, count;
@@ -835,7 +829,6 @@ void snd_card_info_read_oss(struct snd_info_buffer *buffer)
 #endif
 
 #ifdef MODULE
-static struct snd_info_entry *snd_card_module_info_entry;
 static void snd_card_module_info_read(struct snd_info_entry *entry,
                                      struct snd_info_buffer *buffer)
 {
@@ -864,7 +857,6 @@ int __init snd_card_info_init(void)
                snd_info_free_entry(entry);
                return -ENOMEM;
        }
-       snd_card_info_entry = entry;
 
 #ifdef MODULE
        entry = snd_info_create_module_entry(THIS_MODULE, "modules", NULL);
@@ -872,23 +864,11 @@ int __init snd_card_info_init(void)
                entry->c.text.read = snd_card_module_info_read;
                if (snd_info_register(entry) < 0)
                        snd_info_free_entry(entry);
-               else
-                       snd_card_module_info_entry = entry;
        }
 #endif
 
        return 0;
 }
-
-int __exit snd_card_info_done(void)
-{
-       snd_info_free_entry(snd_card_info_entry);
-#ifdef MODULE
-       snd_info_free_entry(snd_card_module_info_entry);
-#endif
-       return 0;
-}
-
 #endif /* CONFIG_PROC_FS */
 
 /**