ALSA: emu10k1: Fix/cleanup ifdef CONFIG_PROC_FS

Build emuproc.o conditionally and drop the unneeded ifdefs.
Some are replaced with the new CONFIG_SND_PROC_FS.

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

diff --git a/sound/pci/emu10k1/Makefile b/sound/pci/emu10k1/Makefile
index fc5591e7777e3a5f914ae990d89b1c8c60b63562..29b44ca2701056a6f56310d8e55c0c856215afed 100644 (file)
--- a/sound/pci/emu10k1/Makefile
+++ b/sound/pci/emu10k1/Makefile
@@ -5,7 +5,8 @@
 
 snd-emu10k1-objs := emu10k1.o emu10k1_main.o \
                    irq.o memory.o voice.o emumpu401.o emupcm.o io.o \
-                   emuproc.o emumixer.o emufx.o timer.o p16v.o
+                   emumixer.o emufx.o timer.o p16v.o
+snd-emu10k1-$(CONFIG_SND_PROC_FS) += emuproc.o
 snd-emu10k1-synth-objs := emu10k1_synth.o emu10k1_callback.o emu10k1_patch.o
 snd-emu10k1x-objs := emu10k1x.o
 

diff --git a/sound/pci/emu10k1/emu10k1_main.c b/sound/pci/emu10k1/emu10k1_main.c
index 54219fd662a1b2baea75389c2e6c424a6f7be542..28e2f8b42f5e8e4e7f3aaaaa88f45d6834b02591 100644 (file)
--- a/sound/pci/emu10k1/emu10k1_main.c
+++ b/sound/pci/emu10k1/emu10k1_main.c
@@ -2063,7 +2063,7 @@ int snd_emu10k1_create(struct snd_card *card,
        if (err < 0)
                goto error;
 
-#ifdef CONFIG_PROC_FS
+#ifdef CONFIG_SND_PROC_FS
        snd_emu10k1_proc_init(emu);
 #endif
 

diff --git a/sound/pci/emu10k1/emuproc.c b/sound/pci/emu10k1/emuproc.c
index 53745f4c2bf59f136ed664edd4276d8ccf5cfa63..cf05229b569beec224efe306c6eb4e1b37580d22 100644 (file)
--- a/sound/pci/emu10k1/emuproc.c
+++ b/sound/pci/emu10k1/emuproc.c
@@ -34,7 +34,6 @@
 #include <sound/emu10k1.h>
 #include "p16v.h"
 
-#ifdef CONFIG_PROC_FS
 static void snd_emu10k1_proc_spdif_status(struct snd_emu10k1 * emu,
                                          struct snd_info_buffer *buffer,
                                          char *title,
@@ -656,4 +655,3 @@ int snd_emu10k1_proc_init(struct snd_emu10k1 *emu)
        }
        return 0;
 }
-#endif /* CONFIG_PROC_FS */