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

ALSA: pci: Remove superfluous snd_info_register() calls 



The calls of snd_info_register() are superfluous and should be avoided
at the procfs creation time.  They are called at the end of the whole
initialization via snd_card_register().  This patch drops such
superfluous calls, as well as dropping the superfluous setup of
SNDRV_INFO_CONTENT_TEXT.

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

sound/pci/ac97/ac97_proc.c

+9 −17
Original line number Diff line number Diff line
@@ -436,25 +436,20 @@ void snd_ac97_proc_init(struct snd_ac97 * ac97) 
		return;

	prefix = ac97_is_audio(ac97) ? "ac97" : "mc97";

	sprintf(name, "%s#%d-%d", prefix, ac97->addr, ac97->num);

	if ((entry = snd_info_create_card_entry(ac97->bus->card, name, ac97->bus->proc)) != NULL) {

	entry = snd_info_create_card_entry(ac97->bus->card, name,

					   ac97->bus->proc);

	if (entry)

		snd_info_set_text_ops(entry, ac97, snd_ac97_proc_read);

		if (snd_info_register(entry) < 0) {

			snd_info_free_entry(entry);

			entry = NULL;

		}

	}

	ac97->proc = entry;

	sprintf(name, "%s#%d-%d+regs", prefix, ac97->addr, ac97->num);

	if ((entry = snd_info_create_card_entry(ac97->bus->card, name, ac97->bus->proc)) != NULL) {

	entry = snd_info_create_card_entry(ac97->bus->card, name,

					   ac97->bus->proc);

	if (entry) {

		snd_info_set_text_ops(entry, ac97, snd_ac97_proc_regs_read);

#ifdef CONFIG_SND_DEBUG

		entry->mode |= 0200;

		entry->c.text.write = snd_ac97_proc_regs_write;

#endif

		if (snd_info_register(entry) < 0) {

			snd_info_free_entry(entry);

			entry = NULL;

		}

	}

	ac97->proc_regs = entry;

}
@@ -473,13 +468,10 @@ void snd_ac97_bus_proc_init(struct snd_ac97_bus * bus) 
	char name[32];



	sprintf(name, "codec97#%d", bus->num);

	if ((entry = snd_info_create_card_entry(bus->card, name, bus->card->proc_root)) != NULL) {

	entry = snd_info_create_card_entry(bus->card, name,

					   bus->card->proc_root);

	if (entry)

		entry->mode = S_IFDIR | 0555;

		if (snd_info_register(entry) < 0) {

			snd_info_free_entry(entry);

			entry = NULL;

		}

	}

	bus->proc = entry;

}

sound/pci/cs46xx/dsp_spos.c

+5 −35
Original line number Diff line number Diff line
@@ -799,30 +799,20 @@ int cs46xx_dsp_proc_init (struct snd_card *card, struct snd_cs46xx *chip) 


	ins->snd_card = card;



	if ((entry = snd_info_create_card_entry(card, "dsp", card->proc_root)) != NULL) {

		entry->content = SNDRV_INFO_CONTENT_TEXT;

	entry = snd_info_create_card_entry(card, "dsp", card->proc_root);

	if (entry)

		entry->mode = S_IFDIR | 0555;

      

		if (snd_info_register(entry) < 0) {

			snd_info_free_entry(entry);

			entry = NULL;

		}

	}



	ins->proc_dsp_dir = entry;



	if (!ins->proc_dsp_dir)

		return -ENOMEM;



	if ((entry = snd_info_create_card_entry(card, "spos_symbols", ins->proc_dsp_dir)) != NULL) {

		entry->content = SNDRV_INFO_CONTENT_TEXT;

	entry = snd_info_create_card_entry(card, "spos_symbols",

					   ins->proc_dsp_dir);

	if (entry) {

		entry->private_data = chip;

		entry->mode = S_IFREG | 0644;

		entry->c.text.read = cs46xx_dsp_proc_symbol_table_read;

		if (snd_info_register(entry) < 0) {

			snd_info_free_entry(entry);

			entry = NULL;

		}

	}

	ins->proc_sym_info_entry = entry;
@@ -831,10 +821,6 @@ int cs46xx_dsp_proc_init (struct snd_card *card, struct snd_cs46xx *chip) 
		entry->private_data = chip;

		entry->mode = S_IFREG | 0644;

		entry->c.text.read = cs46xx_dsp_proc_modules_read;

		if (snd_info_register(entry) < 0) {

			snd_info_free_entry(entry);

			entry = NULL;

		}

	}

	ins->proc_modules_info_entry = entry;
@@ -843,10 +829,6 @@ int cs46xx_dsp_proc_init (struct snd_card *card, struct snd_cs46xx *chip) 
		entry->private_data = chip;

		entry->mode = S_IFREG | 0644;

		entry->c.text.read = cs46xx_dsp_proc_parameter_dump_read;

		if (snd_info_register(entry) < 0) {

			snd_info_free_entry(entry);

			entry = NULL;

		}

	}

	ins->proc_parameter_dump_info_entry = entry;
@@ -855,10 +837,6 @@ int cs46xx_dsp_proc_init (struct snd_card *card, struct snd_cs46xx *chip) 
		entry->private_data = chip;

		entry->mode = S_IFREG | 0644;

		entry->c.text.read = cs46xx_dsp_proc_sample_dump_read;

		if (snd_info_register(entry) < 0) {

			snd_info_free_entry(entry);

			entry = NULL;

		}

	}

	ins->proc_sample_dump_info_entry = entry;
@@ -867,10 +845,6 @@ int cs46xx_dsp_proc_init (struct snd_card *card, struct snd_cs46xx *chip) 
		entry->private_data = chip;

		entry->mode = S_IFREG | 0644;

		entry->c.text.read = cs46xx_dsp_proc_task_tree_read;

		if (snd_info_register(entry) < 0) {

			snd_info_free_entry(entry);

			entry = NULL;

		}

	}

	ins->proc_task_info_entry = entry;
@@ -879,10 +853,6 @@ int cs46xx_dsp_proc_init (struct snd_card *card, struct snd_cs46xx *chip) 
		entry->private_data = chip;

		entry->mode = S_IFREG | 0644;

		entry->c.text.read = cs46xx_dsp_proc_scb_read;

		if (snd_info_register(entry) < 0) {

			snd_info_free_entry(entry);

			entry = NULL;

		}

	}

	ins->proc_scb_info_entry = entry;

sound/pci/cs46xx/dsp_spos_scb_lib.c

+0 −6
Original line number Diff line number Diff line
@@ -271,12 +271,6 @@ void cs46xx_dsp_proc_register_scb_desc (struct snd_cs46xx *chip, 
			entry->mode = S_IFREG | 0644;

      

			entry->c.text.read = cs46xx_dsp_proc_scb_info_read;

      

			if (snd_info_register(entry) < 0) {

				snd_info_free_entry(entry);

				kfree (scb_info);

				entry = NULL;

			}

		}

out:

		scb->proc_info = entry;