Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c43a55d5 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: opl4: Fix / cleanup ifdef CONFIG_PROC_FS 



Some are replaced with the new ifdef CONFIG_SND_PROC_FS.  Some are
removed by building opl4_proc.o conditionally.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 129a4c9f

sound/drivers/opl4/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -3,7 +3,8 @@ 
# Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz>

#



snd-opl4-lib-objs := opl4_lib.o opl4_mixer.o opl4_proc.o

snd-opl4-lib-objs := opl4_lib.o opl4_mixer.o

snd-opl4-lib-$(CONFIG_SND_PROC_FS) += opl4_proc.o

snd-opl4-synth-objs := opl4_seq.o opl4_synth.o yrw801.o



obj-$(CONFIG_SND_OPL4_LIB) += snd-opl4-lib.o

sound/drivers/opl4/opl4_lib.c

+0 −4
Original line number Diff line number Diff line
@@ -176,9 +176,7 @@ static int snd_opl4_create_seq_dev(struct snd_opl4 *opl4, int seq_device) 


static void snd_opl4_free(struct snd_opl4 *opl4)

{

#ifdef CONFIG_PROC_FS

	snd_opl4_free_proc(opl4);

#endif

	release_and_free_resource(opl4->res_fm_port);

	release_and_free_resource(opl4->res_pcm_port);

	kfree(opl4);
@@ -249,9 +247,7 @@ int snd_opl4_create(struct snd_card *card, 
	snd_opl4_enable_opl4(opl4);



	snd_opl4_create_mixer(opl4);

#ifdef CONFIG_PROC_FS

	snd_opl4_create_proc(opl4);

#endif



#if defined(CONFIG_SND_SEQUENCER) || (defined(MODULE) && defined(CONFIG_SND_SEQUENCER_MODULE))

	opl4->seq_client = -1;

sound/drivers/opl4/opl4_local.h

+5 −2
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ struct snd_opl4 { 
	spinlock_t reg_lock;

	struct snd_card *card;



#ifdef CONFIG_PROC_FS

#ifdef CONFIG_SND_PROC_FS

	struct snd_info_entry *proc_entry;

	int memory_access;

#endif
@@ -207,10 +207,13 @@ void snd_opl4_write_memory(struct snd_opl4 *opl4, const char *buf, int offset, i 
/* opl4_mixer.c */

int snd_opl4_create_mixer(struct snd_opl4 *opl4);



#ifdef CONFIG_PROC_FS

#ifdef CONFIG_SND_PROC_FS

/* opl4_proc.c */

int snd_opl4_create_proc(struct snd_opl4 *opl4);

void snd_opl4_free_proc(struct snd_opl4 *opl4);

#else

static inline int snd_opl4_create_proc(struct snd_opl4 *opl4) { return 0; }

static inline void snd_opl4_free_proc(struct snd_opl4 *opl4) {}

#endif



/* opl4_seq.c */

sound/drivers/opl4/opl4_proc.c

+0 −4
Original line number Diff line number Diff line
@@ -22,8 +22,6 @@ 
#include <linux/export.h>

#include <sound/info.h>



#ifdef CONFIG_PROC_FS



static int snd_opl4_mem_proc_open(struct snd_info_entry *entry,

				  unsigned short mode, void **file_private_data)

{
@@ -129,5 +127,3 @@ void snd_opl4_free_proc(struct snd_opl4 *opl4) 
{

	snd_info_free_entry(opl4->proc_entry);

}
 


#endif /* CONFIG_PROC_FS */