Commit 52262b4a authored by Takashi Iwai's avatar Takashi Iwai
Browse files

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: default avatarTakashi Iwai <tiwai@suse.de>
parent 506e6ae2

include/sound/emux_synth.h

+1 −1
Original line number Diff line number Diff line
@@ -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

sound/synth/emux/Makefile

+3 −2
Original line number Diff line number Diff line
@@ -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

sound/synth/emux/emux.c

+0 −4
Original line number Diff line number Diff line
@@ -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);

sound/synth/emux/emux_proc.c

+0 −4
Original line number Diff line number Diff line
@@ -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 */

sound/synth/emux/emux_voice.h

+5 −1
Original line number Diff line number Diff line
@@ -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)