Skip to content

Commit

Permalink
ALSA: firewire: Remove superfluous snd_info_register() calls
Browse files Browse the repository at this point in the history 
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.

Reviewed-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Tested-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
  • Loading branch information
@tiwai
tiwai committed Feb 6, 2019
1 parent 348c5ad commit 0c298bd
Show file tree
Hide file tree
Showing 8 changed files with 16 additions and 84 deletions.
12 changes: 2 additions & 10 deletions sound/firewire/bebob/bebob_proc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,12 +163,8 @@ add_node(struct snd_bebob *bebob, struct snd_info_entry *root, const char *name,
struct snd_info_entry *entry;

entry = snd_info_create_card_entry(bebob->card, name, root);
if (entry == NULL)
return;

snd_info_set_text_ops(entry, bebob, op);
if (snd_info_register(entry) < 0)
snd_info_free_entry(entry);
if (entry)
snd_info_set_text_ops(entry, bebob, op);
}

void snd_bebob_proc_init(struct snd_bebob *bebob)
Expand All @@ -184,10 +180,6 @@ void snd_bebob_proc_init(struct snd_bebob *bebob)
if (root == NULL)
return;
root->mode = S_IFDIR | 0555;
if (snd_info_register(root) < 0) {
snd_info_free_entry(root);
return;
}

add_node(bebob, root, "clock", proc_read_clock);
add_node(bebob, root, "firmware", proc_read_hw_info);
Expand Down
12 changes: 2 additions & 10 deletions sound/firewire/dice/dice-proc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -285,12 +285,8 @@ static void add_node(struct snd_dice *dice, struct snd_info_entry *root,
struct snd_info_entry *entry;

entry = snd_info_create_card_entry(dice->card, name, root);
if (!entry)
return;

snd_info_set_text_ops(entry, dice, op);
if (snd_info_register(entry) < 0)
snd_info_free_entry(entry);
if (entry)
snd_info_set_text_ops(entry, dice, op);
}

void snd_dice_create_proc(struct snd_dice *dice)
Expand All @@ -306,10 +302,6 @@ void snd_dice_create_proc(struct snd_dice *dice)
if (!root)
return;
root->mode = S_IFDIR | 0555;
if (snd_info_register(root) < 0) {
snd_info_free_entry(root);
return;
}

add_node(dice, root, "dice", dice_proc_read);
add_node(dice, root, "formation", dice_proc_read_formation);
Expand Down
16 changes: 2 additions & 14 deletions sound/firewire/digi00x/digi00x-proc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,20 +80,8 @@ void snd_dg00x_proc_init(struct snd_dg00x *dg00x)
return;

root->mode = S_IFDIR | 0555;
if (snd_info_register(root) < 0) {
snd_info_free_entry(root);
return;
}

entry = snd_info_create_card_entry(dg00x->card, "clock", root);
if (entry == NULL) {
snd_info_free_entry(root);
return;
}

snd_info_set_text_ops(entry, dg00x, proc_read_clock);
if (snd_info_register(entry) < 0) {
snd_info_free_entry(entry);
snd_info_free_entry(root);
}
if (entry)
snd_info_set_text_ops(entry, dg00x, proc_read_clock);
}
12 changes: 2 additions & 10 deletions sound/firewire/fireface/ff-proc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,8 @@ static void add_node(struct snd_ff *ff, struct snd_info_entry *root,
struct snd_info_entry *entry;

entry = snd_info_create_card_entry(ff->card, name, root);
if (entry == NULL)
return;

snd_info_set_text_ops(entry, ff, op);
if (snd_info_register(entry) < 0)
snd_info_free_entry(entry);
if (entry)
snd_info_set_text_ops(entry, ff, op);
}

void snd_ff_proc_init(struct snd_ff *ff)
Expand All @@ -62,10 +58,6 @@ void snd_ff_proc_init(struct snd_ff *ff)
if (root == NULL)
return;
root->mode = S_IFDIR | 0555;
if (snd_info_register(root) < 0) {
snd_info_free_entry(root);
return;
}

add_node(ff, root, "status", proc_dump_status);
}
12 changes: 2 additions & 10 deletions sound/firewire/fireworks/fireworks_proc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -199,12 +199,8 @@ add_node(struct snd_efw *efw, struct snd_info_entry *root, const char *name,
struct snd_info_entry *entry;

entry = snd_info_create_card_entry(efw->card, name, root);
if (entry == NULL)
return;

snd_info_set_text_ops(entry, efw, op);
if (snd_info_register(entry) < 0)
snd_info_free_entry(entry);
if (entry)
snd_info_set_text_ops(entry, efw, op);
}

void snd_efw_proc_init(struct snd_efw *efw)
Expand All @@ -220,10 +216,6 @@ void snd_efw_proc_init(struct snd_efw *efw)
if (root == NULL)
return;
root->mode = S_IFDIR | 0555;
if (snd_info_register(root) < 0) {
snd_info_free_entry(root);
return;
}

add_node(efw, root, "clock", proc_read_clock);
add_node(efw, root, "firmware", proc_read_hwinfo);
Expand Down
12 changes: 2 additions & 10 deletions sound/firewire/motu/motu-proc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,12 +87,8 @@ static void add_node(struct snd_motu *motu, struct snd_info_entry *root,
struct snd_info_entry *entry;

entry = snd_info_create_card_entry(motu->card, name, root);
if (entry == NULL)
return;

snd_info_set_text_ops(entry, motu, op);
if (snd_info_register(entry) < 0)
snd_info_free_entry(entry);
if (entry)
snd_info_set_text_ops(entry, motu, op);
}

void snd_motu_proc_init(struct snd_motu *motu)
Expand All @@ -108,10 +104,6 @@ void snd_motu_proc_init(struct snd_motu *motu)
if (root == NULL)
return;
root->mode = S_IFDIR | 0555;
if (snd_info_register(root) < 0) {
snd_info_free_entry(root);
return;
}

add_node(motu, root, "clock", proc_read_clock);
add_node(motu, root, "format", proc_read_format);
Expand Down
12 changes: 2 additions & 10 deletions sound/firewire/oxfw/oxfw-proc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,12 +83,8 @@ static void add_node(struct snd_oxfw *oxfw, struct snd_info_entry *root,
struct snd_info_entry *entry;

entry = snd_info_create_card_entry(oxfw->card, name, root);
if (entry == NULL)
return;

snd_info_set_text_ops(entry, oxfw, op);
if (snd_info_register(entry) < 0)
snd_info_free_entry(entry);
if (entry)
snd_info_set_text_ops(entry, oxfw, op);
}

void snd_oxfw_proc_init(struct snd_oxfw *oxfw)
Expand All @@ -104,10 +100,6 @@ void snd_oxfw_proc_init(struct snd_oxfw *oxfw)
if (root == NULL)
return;
root->mode = S_IFDIR | 0555;
if (snd_info_register(root) < 0) {
snd_info_free_entry(root);
return;
}

add_node(oxfw, root, "formation", proc_read_formation);
}
12 changes: 2 additions & 10 deletions sound/firewire/tascam/tascam-proc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,8 @@ static void add_node(struct snd_tscm *tscm, struct snd_info_entry *root,
struct snd_info_entry *entry;

entry = snd_info_create_card_entry(tscm->card, name, root);
if (entry == NULL)
return;

snd_info_set_text_ops(entry, tscm, op);
if (snd_info_register(entry) < 0)
snd_info_free_entry(entry);
if (entry)
snd_info_set_text_ops(entry, tscm, op);
}

void snd_tscm_proc_init(struct snd_tscm *tscm)
Expand All @@ -79,10 +75,6 @@ void snd_tscm_proc_init(struct snd_tscm *tscm)
if (root == NULL)
return;
root->mode = S_IFDIR | 0555;
if (snd_info_register(root) < 0) {
snd_info_free_entry(root);
return;
}

add_node(tscm, root, "firmware", proc_read_firmware);
}

0 comments on commit 0c298bd

Please sign in to comment.