Commit 0c298bdc authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: firewire: 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.

Reviewed-by: default avatarTakashi Sakamoto <o-takashi@sakamocchi.jp>
Tested-by: default avatarTakashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 348c5ad5

sound/firewire/bebob/bebob_proc.c

+2 −10
Original line number Diff line number Diff line
@@ -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;



	if (entry)

		snd_info_set_text_ops(entry, bebob, op);

	if (snd_info_register(entry) < 0)

		snd_info_free_entry(entry);

}



void snd_bebob_proc_init(struct snd_bebob *bebob)
@@ -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);

sound/firewire/dice/dice-proc.c

+2 −10
Original line number Diff line number Diff line
@@ -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;



	if (entry)

		snd_info_set_text_ops(entry, dice, op);

	if (snd_info_register(entry) < 0)

		snd_info_free_entry(entry);

}



void snd_dice_create_proc(struct snd_dice *dice)
@@ -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);

sound/firewire/digi00x/digi00x-proc.c

+2 −14
Original line number Diff line number Diff line
@@ -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;

	}



	if (entry)

		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);

	}

}

sound/firewire/fireface/ff-proc.c

+2 −10
Original line number Diff line number Diff line
@@ -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;



	if (entry)

		snd_info_set_text_ops(entry, ff, op);

	if (snd_info_register(entry) < 0)

		snd_info_free_entry(entry);

}



void snd_ff_proc_init(struct snd_ff *ff)
@@ -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);

}

sound/firewire/fireworks/fireworks_proc.c

+2 −10
Original line number Diff line number Diff line
@@ -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;



	if (entry)

		snd_info_set_text_ops(entry, efw, op);

	if (snd_info_register(entry) < 0)

		snd_info_free_entry(entry);

}



void snd_efw_proc_init(struct snd_efw *efw)
@@ -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);