3 files changed, 26 insertions, 46 deletions

diff --git a/sound/pci/ac97/ac97_proc.c b/sound/pci/ac97/ac97_proc.c
index 2118df50b9d6..a3fdd7da911c 100644
--- a/sound/pci/ac97/ac97_proc.c
+++ b/sound/pci/ac97/ac97_proc.c
@@ -457,14 +457,10 @@ void snd_ac97_proc_init(struct snd_ac97 * ac97)
 
 void snd_ac97_proc_done(struct snd_ac97 * ac97)
 {
-        if (ac97->proc_regs) {
-                snd_info_unregister(ac97->proc_regs);
-                ac97->proc_regs = NULL;
-        }
-        if (ac97->proc) {
-                snd_info_unregister(ac97->proc);
-                ac97->proc = NULL;
-        }
+        snd_info_free_entry(ac97->proc_regs);
+        ac97->proc_regs = NULL;
+        snd_info_free_entry(ac97->proc);
+        ac97->proc = NULL;
 }
 
 void snd_ac97_bus_proc_init(struct snd_ac97_bus * bus)
@@ -485,8 +481,6 @@ void snd_ac97_bus_proc_init(struct snd_ac97_bus * bus)
 
 void snd_ac97_bus_proc_done(struct snd_ac97_bus * bus)
 {
-        if (bus->proc) {
-                snd_info_unregister(bus->proc);
-                bus->proc = NULL;
-        }
+        snd_info_free_entry(bus->proc);
+        bus->proc = NULL;
 }
diff --git a/sound/pci/cs46xx/dsp_spos.c b/sound/pci/cs46xx/dsp_spos.c
index 5c9711c0265c..89c402770a1d 100644
--- a/sound/pci/cs46xx/dsp_spos.c
+++ b/sound/pci/cs46xx/dsp_spos.c
@@ -868,35 +868,23 @@ int cs46xx_dsp_proc_done (struct snd_cs46xx *chip)
         struct dsp_spos_instance * ins = chip->dsp_spos_instance;
         int i;
 
-        if (ins->proc_sym_info_entry) {
-                snd_info_unregister(ins->proc_sym_info_entry);
-                ins->proc_sym_info_entry = NULL;
-        }
-  
-        if (ins->proc_modules_info_entry) {
-                snd_info_unregister(ins->proc_modules_info_entry);
-                ins->proc_modules_info_entry = NULL;
-        }
- 
-        if (ins->proc_parameter_dump_info_entry) {
-                snd_info_unregister(ins->proc_parameter_dump_info_entry);
-                ins->proc_parameter_dump_info_entry = NULL;
-        }
-  
-        if (ins->proc_sample_dump_info_entry) {
-                snd_info_unregister(ins->proc_sample_dump_info_entry);
-                ins->proc_sample_dump_info_entry = NULL;
-        }
-  
-        if (ins->proc_scb_info_entry) {
-                snd_info_unregister(ins->proc_scb_info_entry);
-                ins->proc_scb_info_entry = NULL;
-        }
-  
-        if (ins->proc_task_info_entry) {
-                snd_info_unregister(ins->proc_task_info_entry);
-                ins->proc_task_info_entry = NULL;
-        }
+        snd_info_free_entry(ins->proc_sym_info_entry);
+        ins->proc_sym_info_entry = NULL;
+
+        snd_info_free_entry(ins->proc_modules_info_entry);
+        ins->proc_modules_info_entry = NULL;
+
+        snd_info_free_entry(ins->proc_parameter_dump_info_entry);
+        ins->proc_parameter_dump_info_entry = NULL;
+
+        snd_info_free_entry(ins->proc_sample_dump_info_entry);
+        ins->proc_sample_dump_info_entry = NULL;
+
+        snd_info_free_entry(ins->proc_scb_info_entry);
+        ins->proc_scb_info_entry = NULL;
+
+        snd_info_free_entry(ins->proc_task_info_entry);
+        ins->proc_task_info_entry = NULL;
 
         mutex_lock(&chip->spos_mutex);
         for (i = 0; i < ins->nscb; ++i) {
@@ -905,10 +893,8 @@ int cs46xx_dsp_proc_done (struct snd_cs46xx *chip)
         }
         mutex_unlock(&chip->spos_mutex);
 
-        if (ins->proc_dsp_dir) {
-                snd_info_unregister (ins->proc_dsp_dir);
-                ins->proc_dsp_dir = NULL;
-        }
+        snd_info_free_entry(ins->proc_dsp_dir);
+        ins->proc_dsp_dir = NULL;
 
         return 0;
 }
diff --git a/sound/pci/cs46xx/dsp_spos_scb_lib.c b/sound/pci/cs46xx/dsp_spos_scb_lib.c
index 232b337852ff..343f51d5311b 100644
--- a/sound/pci/cs46xx/dsp_spos_scb_lib.c
+++ b/sound/pci/cs46xx/dsp_spos_scb_lib.c
@@ -233,7 +233,7 @@ void cs46xx_dsp_proc_free_scb_desc (struct dsp_scb_descriptor * scb)
 
                 snd_printdd("cs46xx_dsp_proc_free_scb_desc: freeing %s\n",scb->scb_name);
 
-                snd_info_unregister(scb->proc_info);
+                snd_info_free_entry(scb->proc_info);
                 scb->proc_info = NULL;
 
                 snd_assert (scb_info != NULL, return);