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: Jaroslav Kysela <perex@perex.cz> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Bu işleme şunda yer alıyor:
@@ -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;
|
||||
|
||||
|
@@ -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;
|
||||
|
Yeni konuda referans
Bir kullanıcı engelle