ALSA: emux: Fix/cleanup old ifdef CONFIG_PROC_FS

Build emux_proc.o and drop the unneeded ifdefs.
Replace the left CONFIG_PROC with the new CONFIG_SND_PROC_FS.

Along with this, fix the build of emux_oss.o in Makefile, too.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/include/sound/emux_synth.h b/include/sound/emux_synth.h
index fb81f3722b6a37ea4f83a89ba0e177c6d6cd4a66..a0a40b74bf13ed8a954bb2595ccaa73c6237dbdd 100644 (file)
--- a/include/sound/emux_synth.h
+++ b/include/sound/emux_synth.h
@@ -125,7 +125,7 @@ struct snd_emux {
 
        struct snd_util_memhdr *memhdr; /* memory chunk information */
 
-#ifdef CONFIG_PROC_FS
+#ifdef CONFIG_SND_PROC_FS
        struct snd_info_entry *proc;
 #endif
 

diff --git a/sound/synth/emux/Makefile b/sound/synth/emux/Makefile
index 328594e6152dc4670dcf897829c95ccd1b31986d..fb761c2c2b50fd7ae91d0d47aeb2922d20130c07 100644 (file)
--- a/sound/synth/emux/Makefile
+++ b/sound/synth/emux/Makefile
@@ -4,8 +4,9 @@
 #
 
 snd-emux-synth-objs := emux.o emux_synth.o emux_seq.o emux_nrpn.o \
-                      emux_effect.o emux_proc.o emux_hwdep.o soundfont.o \
-                      $(if $(CONFIG_SND_SEQUENCER_OSS),emux_oss.o)
+                      emux_effect.o emux_hwdep.o soundfont.o
+snd-emux-synth-$(CONFIG_SND_PROC_FS) += emux_proc.o
+snd-emux-synth-$(CONFIG_SND_SEQUENCER_OSS) += emux_oss.o
 
 # Toplevel Module Dependencies
 obj-$(CONFIG_SND_SBAWE_SEQ) += snd-emux-synth.o

diff --git a/sound/synth/emux/emux.c b/sound/synth/emux/emux.c
index 49195325fdf6c6f7fe74ac50e3e4c3466c4ff60d..9312cd8a6fdd11b6c9749e97e0fee3b8ce9f0000 100644 (file)
--- a/sound/synth/emux/emux.c
+++ b/sound/synth/emux/emux.c
@@ -128,9 +128,7 @@ int snd_emux_register(struct snd_emux *emu, struct snd_card *card, int index, ch
 #endif
        snd_emux_init_virmidi(emu, card);
 
-#ifdef CONFIG_PROC_FS
        snd_emux_proc_init(emu, card, index);
-#endif
        return 0;
 }
 
@@ -150,9 +148,7 @@ int snd_emux_free(struct snd_emux *emu)
                del_timer(&emu->tlist);
        spin_unlock_irqrestore(&emu->voice_lock, flags);
 
-#ifdef CONFIG_PROC_FS
        snd_emux_proc_free(emu);
-#endif
        snd_emux_delete_virmidi(emu);
 #ifdef CONFIG_SND_SEQUENCER_OSS
        snd_emux_detach_seq_oss(emu);

diff --git a/sound/synth/emux/emux_proc.c b/sound/synth/emux/emux_proc.c
index 58a32a10d115863661dea284024fae49102c889a..a82b4053bee855be16ed74e2b1f6bc3fc548ac04 100644 (file)
--- a/sound/synth/emux/emux_proc.c
+++ b/sound/synth/emux/emux_proc.c
@@ -24,8 +24,6 @@
 #include <sound/info.h>
 #include "emux_voice.h"
 
-#ifdef CONFIG_PROC_FS
-
 static void
 snd_emux_proc_info_read(struct snd_info_entry *entry, 
                        struct snd_info_buffer *buf)
@@ -128,5 +126,3 @@ void snd_emux_proc_free(struct snd_emux *emu)
        snd_info_free_entry(emu->proc);
        emu->proc = NULL;
 }
-
-#endif /* CONFIG_PROC_FS */

diff --git a/sound/synth/emux/emux_voice.h b/sound/synth/emux/emux_voice.h
index 09711f84ed3049129681cb8b074e7f2b9c0ce2e2..a7073c371bcc01f8a02ece1502d59f46ec70d5d8 100644 (file)
--- a/sound/synth/emux/emux_voice.h
+++ b/sound/synth/emux/emux_voice.h
@@ -82,9 +82,13 @@ void snd_emux_init_seq_oss(struct snd_emux *emu);
 void snd_emux_detach_seq_oss(struct snd_emux *emu);
 
 /* emux_proc.c */
-#ifdef CONFIG_PROC_FS
+#ifdef CONFIG_SND_PROC_FS
 void snd_emux_proc_init(struct snd_emux *emu, struct snd_card *card, int device);
 void snd_emux_proc_free(struct snd_emux *emu);
+#else
+static inline void snd_emux_proc_init(struct snd_emux *emu,
+                                     struct snd_card *card, int device) {}
+static inline void snd_emux_proc_free(struct snd_emux *emu) {}
 #endif
 
 #define STATE_IS_PLAYING(s) ((s) & SNDRV_EMUX_ST_ON)