[ALSA] Fix disconnection of proc interface

- Add the linked list to each proc entry to enable a single-shot
  disconnection (unregister)
- Deprecate snd_info_unregister(), use snd_info_free_entry()
- Removed NULL checks of snd_info_free_entry()

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>

2 files changed, 5 insertions, 9 deletions

diff --git a/sound/core/oss/mixer_oss.c b/sound/core/oss/mixer_oss.c
index 75a9505c7445..00c95def95aa 100644
--- a/sound/core/oss/mixer_oss.c
+++ b/sound/core/oss/mixer_oss.c
@@ -1193,10 +1193,8 @@ static void snd_mixer_oss_proc_init(struct snd_mixer_oss *mixer)
 
 static void snd_mixer_oss_proc_done(struct snd_mixer_oss *mixer)
 {
-        if (mixer->proc_entry) {
-                snd_info_unregister(mixer->proc_entry);
-                mixer->proc_entry = NULL;
-        }
+        snd_info_free_entry(mixer->proc_entry);
+        mixer->proc_entry = NULL;
 }
 #else /* !CONFIG_PROC_FS */
 #define snd_mixer_oss_proc_init(mix)
diff --git a/sound/core/oss/pcm_oss.c b/sound/core/oss/pcm_oss.c
index 472fce0ee0e8..a92b93e5ebd5 100644
--- a/sound/core/oss/pcm_oss.c
+++ b/sound/core/oss/pcm_oss.c
@@ -2846,11 +2846,9 @@ static void snd_pcm_oss_proc_done(struct snd_pcm *pcm)
         int stream;
         for (stream = 0; stream < 2; ++stream) {
                 struct snd_pcm_str *pstr = &pcm->streams[stream];
-                if (pstr->oss.proc_entry) {
-                        snd_info_unregister(pstr->oss.proc_entry);
-                        pstr->oss.proc_entry = NULL;
-                        snd_pcm_oss_proc_free_setup_list(pstr);
-                }
+                snd_info_free_entry(pstr->oss.proc_entry);
+                pstr->oss.proc_entry = NULL;
+                snd_pcm_oss_proc_free_setup_list(pstr);
         }
 }
 #else /* !CONFIG_SND_VERBOSE_PROCFS */