Commit 1bac5e1c authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: isa: Clean up with new procfs helpers 



Simplify the proc fs creation code with new helper functions,
snd_card_ro_proc_new() and snd_card_rw_proc_new().
Just a code refactoring and no functional changes.

Reviewed-by: default avatarJaroslav Kysela <perex@perex.cz>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 815d808c

sound/isa/gus/gus_irq.c

+1 −4
Original line number Diff line number Diff line
@@ -140,10 +140,7 @@ static void snd_gus_irq_info_read(struct snd_info_entry *entry, 


void snd_gus_irq_profile_init(struct snd_gus_card *gus)

{

	struct snd_info_entry *entry;



	if (! snd_card_proc_new(gus->card, "gusirq", &entry))

		snd_info_set_text_ops(entry, gus, snd_gus_irq_info_read);

	snd_card_ro_proc_new(gus->card, "gusirq", gus, snd_gus_irq_info_read);

}



#endif

sound/isa/gus/gus_mem.c

+1 −5
Original line number Diff line number Diff line
@@ -238,9 +238,6 @@ int snd_gf1_mem_init(struct snd_gus_card * gus) 
{

	struct snd_gf1_mem *alloc;

	struct snd_gf1_mem_block block;

#ifdef CONFIG_SND_DEBUG

	struct snd_info_entry *entry;

#endif



	alloc = &gus->gf1.mem_alloc;

	mutex_init(&alloc->memory_mutex);
@@ -263,8 +260,7 @@ int snd_gf1_mem_init(struct snd_gus_card * gus) 
	if (snd_gf1_mem_xalloc(alloc, &block) == NULL)

		return -ENOMEM;

#ifdef CONFIG_SND_DEBUG

	if (! snd_card_proc_new(gus->card, "gusmem", &entry))

		snd_info_set_text_ops(entry, gus, snd_gf1_mem_info_read);

	snd_card_ro_proc_new(gus->card, "gusmem", gus, snd_gf1_mem_info_read);

#endif

	return 0;

}

sound/isa/opti9xx/miro.c

+1 −4
Original line number Diff line number Diff line
@@ -997,10 +997,7 @@ static void snd_miro_proc_read(struct snd_info_entry * entry, 
static void snd_miro_proc_init(struct snd_card *card,

			       struct snd_miro *miro)

{

	struct snd_info_entry *entry;



	if (!snd_card_proc_new(card, "miro", &entry))

		snd_info_set_text_ops(entry, miro, snd_miro_proc_read);

	snd_card_ro_proc_new(card, "miro", miro, snd_miro_proc_read);

}



/*

sound/isa/sb/sb16_csp.c

+2 −3
Original line number Diff line number Diff line
@@ -1126,10 +1126,9 @@ static int snd_sb_csp_qsound_transfer(struct snd_sb_csp * p) 
static int init_proc_entry(struct snd_sb_csp * p, int device)

{

	char name[16];

	struct snd_info_entry *entry;



	sprintf(name, "cspD%d", device);

	if (! snd_card_proc_new(p->chip->card, name, &entry))

		snd_info_set_text_ops(entry, p, info_read);

	snd_card_ro_proc_new(p->chip->card, name, p, info_read);

	return 0;

}