diff options
| author | Takashi Iwai <tiwai@suse.de> | 2019-01-23 18:44:38 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2019-01-24 16:40:25 +0300 |
| commit | 480e32ebd524ffdf3d50cc5cac179fb9e44a552d (patch) | |
| tree | 7f9030fe1751a73ab636c567305f1a6e848b3e36 /include/sound | |
| parent | de89750c56f4bf2f04492c6ce298911381a7597a (diff) | |
| download | linux-480e32ebd524ffdf3d50cc5cac179fb9e44a552d.tar.xz | |
ALSA: pcm: Simplify proc file destruction
The proc files are recursively freed by calling with the root
snd_info_entry object, so we don't have to keep each object for
releasing one by one. Move the release of the PCM stream proc root at
the beginning, so that we can remove the redundant code and resource.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'include/sound')
| -rw-r--r-- | include/sound/pcm.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/include/sound/pcm.h b/include/sound/pcm.h index a20d3a48df00..eae6d2b82d7a 100644 --- a/include/sound/pcm.h +++ b/include/sound/pcm.h @@ -481,15 +481,6 @@ struct snd_pcm_substream { #endif #ifdef CONFIG_SND_VERBOSE_PROCFS struct snd_info_entry *proc_root; - struct snd_info_entry *proc_info_entry; - struct snd_info_entry *proc_hw_params_entry; - struct snd_info_entry *proc_sw_params_entry; - struct snd_info_entry *proc_status_entry; - struct snd_info_entry *proc_prealloc_entry; - struct snd_info_entry *proc_prealloc_max_entry; -#ifdef CONFIG_SND_PCM_XRUN_DEBUG - struct snd_info_entry *proc_xrun_injection_entry; -#endif #endif /* CONFIG_SND_VERBOSE_PROCFS */ /* misc flags */ unsigned int hw_opened: 1; @@ -511,10 +502,8 @@ struct snd_pcm_str { #endif #ifdef CONFIG_SND_VERBOSE_PROCFS struct snd_info_entry *proc_root; - struct snd_info_entry *proc_info_entry; #ifdef CONFIG_SND_PCM_XRUN_DEBUG unsigned int xrun_debug; /* 0 = disabled, 1 = verbose, 2 = stacktrace */ - struct snd_info_entry *proc_xrun_debug_entry; #endif #endif struct snd_kcontrol *chmap_kctl; /* channel-mapping controls */ |