summaryrefslogtreecommitdiffstats
path: root/include/sound/info.h
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2015-04-23 10:56:21 +0200
committerTakashi Iwai <tiwai@suse.de>2015-04-24 17:31:08 +0200
commita0dca822e923e605dbdc2f6ed4fcd96b74df9258 (patch)
tree667e4f97b560fa6570f99cc60312a72faca4c852 /include/sound/info.h
parentALSA: core: Build conditionally and remove superfluous ifdefs (diff)
downloadlinux-a0dca822e923e605dbdc2f6ed4fcd96b74df9258.tar.xz
linux-a0dca822e923e605dbdc2f6ed4fcd96b74df9258.zip
ALSA: core: Clean up OSS proc file management
A few minor cleanups: - Move the call of snd_info_minor_register() into snd_info_init() so that we can call all proc-related stuff in a shot - Add missing __init prefix to snd_info_minor_register() - Return an error properly from snd_oss_info_register() - Drop snd_info_minor_unregister() that is superfluous now Acked-by: Jaroslav Kysela <perex@perex.cz> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'include/sound/info.h')
-rw-r--r--include/sound/info.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/include/sound/info.h b/include/sound/info.h
index 3e2fda3c75ee..16269951bafc 100644
--- a/include/sound/info.h
+++ b/include/sound/info.h
@@ -94,10 +94,8 @@ struct snd_info_entry {
#if defined(CONFIG_SND_OSSEMUL) && defined(CONFIG_PROC_FS)
int snd_info_minor_register(void);
-int snd_info_minor_unregister(void);
#else
-#define snd_info_minor_register() /* NOP */
-#define snd_info_minor_unregister() /* NOP */
+#define snd_info_minor_register() 0
#endif