[PATCH 0/3] ALSA: Remove superfluous snd_info

All of lore.kernel.org
 help / color / mirror / Atom feed

* [PATCH 0/3] ALSA: Remove superfluous snd_info_register() calls
@ 2019-02-05 16:05 Takashi Iwai
  2019-02-05 16:05 ` [PATCH 1/3] ALSA: firewire: " Takashi Iwai
                   ` (2 more replies)
  0 siblings, 3 replies; 7+ messages in thread
From: Takashi Iwai @ 2019-02-05 16:05 UTC (permalink / raw)
  To: alsa-devel

Hi,

this is a fallout of the previous patchset, covering more places that
call snd_info_register() unnecessarily.  These should be applied on
top of my previous patchset.

The complete patches are found in topic/proc-fixes branch of sound git
tree.


thanks,

Takashi

===

Takashi Iwai (3):
  ALSA: firewire: Remove superfluous snd_info_register() calls
  ALSA: opl4: Remove superfluous snd_info_register() calls
  ALSA: emux: Remove superfluous snd_info_register() calls

 sound/drivers/opl4/opl4_proc.c            |  4 ----
 sound/firewire/bebob/bebob_proc.c         | 12 ++----------
 sound/firewire/dice/dice-proc.c           | 12 ++----------
 sound/firewire/digi00x/digi00x-proc.c     | 16 ++--------------
 sound/firewire/fireface/ff-proc.c         | 12 ++----------
 sound/firewire/fireworks/fireworks_proc.c | 12 ++----------
 sound/firewire/motu/motu-proc.c           | 12 ++----------
 sound/firewire/oxfw/oxfw-proc.c           | 12 ++----------
 sound/firewire/tascam/tascam-proc.c       | 12 ++----------
 sound/synth/emux/emux_proc.c              |  4 ----
 10 files changed, 16 insertions(+), 92 deletions(-)

-- 
2.16.4

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [PATCH 1/3] ALSA: firewire: Remove superfluous snd_info_register() calls
  2019-02-05 16:05 [PATCH 0/3] ALSA: Remove superfluous snd_info_register() calls Takashi Iwai
@ 2019-02-05 16:05 ` Takashi Iwai
  2019-02-06 14:33   ` Takashi Sakamoto
  2019-02-05 16:05 ` [PATCH 2/3] ALSA: opl4: " Takashi Iwai
  2019-02-05 16:05 ` [PATCH 3/3] ALSA: emux: " Takashi Iwai
  2 siblings, 1 reply; 7+ messages in thread
From: Takashi Iwai @ 2019-02-05 16:05 UTC (permalink / raw)
  To: alsa-devel

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.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
 sound/firewire/bebob/bebob_proc.c         | 12 ++----------
 sound/firewire/dice/dice-proc.c           | 12 ++----------
 sound/firewire/digi00x/digi00x-proc.c     | 16 ++--------------
 sound/firewire/fireface/ff-proc.c         | 12 ++----------
 sound/firewire/fireworks/fireworks_proc.c | 12 ++----------
 sound/firewire/motu/motu-proc.c           | 12 ++----------
 sound/firewire/oxfw/oxfw-proc.c           | 12 ++----------
 sound/firewire/tascam/tascam-proc.c       | 12 ++----------
 8 files changed, 16 insertions(+), 84 deletions(-)

diff --git a/sound/firewire/bebob/bebob_proc.c b/sound/firewire/bebob/bebob_proc.c
index 8096891af913..05e2a1c6326c 100644
--- a/sound/firewire/bebob/bebob_proc.c
+++ b/sound/firewire/bebob/bebob_proc.c
@@ -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)
@@ -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);
diff --git a/sound/firewire/dice/dice-proc.c b/sound/firewire/dice/dice-proc.c
index bb870fc73f99..9b1d509c6320 100644
--- a/sound/firewire/dice/dice-proc.c
+++ b/sound/firewire/dice/dice-proc.c
@@ -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)
@@ -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);
diff --git a/sound/firewire/digi00x/digi00x-proc.c b/sound/firewire/digi00x/digi00x-proc.c
index 6996d5a6ff5f..d22e8675b10f 100644
--- a/sound/firewire/digi00x/digi00x-proc.c
+++ b/sound/firewire/digi00x/digi00x-proc.c
@@ -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);
 }
diff --git a/sound/firewire/fireface/ff-proc.c b/sound/firewire/fireface/ff-proc.c
index a55e68ec1832..b886b541c94b 100644
--- a/sound/firewire/fireface/ff-proc.c
+++ b/sound/firewire/fireface/ff-proc.c
@@ -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)
@@ -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);
 }
diff --git a/sound/firewire/fireworks/fireworks_proc.c b/sound/firewire/fireworks/fireworks_proc.c
index 779ecec5af62..9fa5c34a9572 100644
--- a/sound/firewire/fireworks/fireworks_proc.c
+++ b/sound/firewire/fireworks/fireworks_proc.c
@@ -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)
@@ -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);
diff --git a/sound/firewire/motu/motu-proc.c b/sound/firewire/motu/motu-proc.c
index ab6830a6d242..94327853620a 100644
--- a/sound/firewire/motu/motu-proc.c
+++ b/sound/firewire/motu/motu-proc.c
@@ -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)
@@ -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);
diff --git a/sound/firewire/oxfw/oxfw-proc.c b/sound/firewire/oxfw/oxfw-proc.c
index 27dac071bc73..644107e3782e 100644
--- a/sound/firewire/oxfw/oxfw-proc.c
+++ b/sound/firewire/oxfw/oxfw-proc.c
@@ -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)
@@ -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);
 }
diff --git a/sound/firewire/tascam/tascam-proc.c b/sound/firewire/tascam/tascam-proc.c
index fee3bf32a0da..8bc8d277394a 100644
--- a/sound/firewire/tascam/tascam-proc.c
+++ b/sound/firewire/tascam/tascam-proc.c
@@ -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)
@@ -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);
 }
-- 
2.16.4

^ permalink raw reply related	[flat|nested] 7+ messages in thread

* Re: [PATCH 1/3] ALSA: firewire: Remove superfluous snd_info_register() calls
  2019-02-05 16:05 ` [PATCH 1/3] ALSA: firewire: " Takashi Iwai
@ 2019-02-06 14:33   ` Takashi Sakamoto
  2019-02-06 15:38     ` Jaroslav Kysela
  2019-02-06 17:13     ` Takashi Iwai
  0 siblings, 2 replies; 7+ messages in thread
From: Takashi Sakamoto @ 2019-02-06 14:33 UTC (permalink / raw)
  To: Takashi Iwai; +Cc: alsa-devel

Hi,

On Tue, Feb 05, 2019 at 05:05:25PM +0100, Takashi Iwai wrote:
> 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.
> 
> Signed-off-by: Takashi Iwai <tiwai@suse.de>
> ---
>  sound/firewire/bebob/bebob_proc.c         | 12 ++----------
>  sound/firewire/dice/dice-proc.c           | 12 ++----------
>  sound/firewire/digi00x/digi00x-proc.c     | 16 ++--------------
>  sound/firewire/fireface/ff-proc.c         | 12 ++----------
>  sound/firewire/fireworks/fireworks_proc.c | 12 ++----------
>  sound/firewire/motu/motu-proc.c           | 12 ++----------
>  sound/firewire/oxfw/oxfw-proc.c           | 12 ++----------
>  sound/firewire/tascam/tascam-proc.c       | 12 ++----------
>  8 files changed, 16 insertions(+), 84 deletions(-)

Reviewed-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Tested-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
 

By the way, would I request you to sync alsa-utils repo in
git.alsa-project.org to the one in github.com? 9 patches
were applied to the latter, but never to the former.


Thanks

Takashi Sakamoto

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH 1/3] ALSA: firewire: Remove superfluous snd_info_register() calls
  2019-02-06 14:33   ` Takashi Sakamoto
@ 2019-02-06 15:38     ` Jaroslav Kysela
  2019-02-06 17:13     ` Takashi Iwai
  1 sibling, 0 replies; 7+ messages in thread
From: Jaroslav Kysela @ 2019-02-06 15:38 UTC (permalink / raw)
  To: Takashi Sakamoto, alsa-devel

Dne 6.2.2019 v 15:33 Takashi Sakamoto napsal(a):
> By the way, would I request you to sync alsa-utils repo in
> git.alsa-project.org to the one in github.com? 9 patches
> were applied to the latter, but never to the former.

Fixed. Thanks. I don't know why the sync was not triggered from github
this time. I will create a cron job.

				Jaroslav

-- 
Jaroslav Kysela <perex@perex.cz>
Linux Sound Maintainer; ALSA Project; Red Hat, Inc.

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH 1/3] ALSA: firewire: Remove superfluous snd_info_register() calls
  2019-02-06 14:33   ` Takashi Sakamoto
  2019-02-06 15:38     ` Jaroslav Kysela
@ 2019-02-06 17:13     ` Takashi Iwai
  1 sibling, 0 replies; 7+ messages in thread
From: Takashi Iwai @ 2019-02-06 17:13 UTC (permalink / raw)
  To: Jaroslav Kysela; +Cc: alsa-devel

On Wed, 06 Feb 2019 15:33:22 +0100,
Takashi Sakamoto wrote:
> By the way, would I request you to sync alsa-utils repo in
> git.alsa-project.org to the one in github.com? 9 patches
> were applied to the latter, but never to the former.

I thought it should have been done automatically...
Jaroslav, could you take a look?


thanks,

Takashi

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [PATCH 2/3] ALSA: opl4: Remove superfluous snd_info_register() calls
  2019-02-05 16:05 [PATCH 0/3] ALSA: Remove superfluous snd_info_register() calls Takashi Iwai
  2019-02-05 16:05 ` [PATCH 1/3] ALSA: firewire: " Takashi Iwai
@ 2019-02-05 16:05 ` Takashi Iwai
  2019-02-05 16:05 ` [PATCH 3/3] ALSA: emux: " Takashi Iwai
  2 siblings, 0 replies; 7+ messages in thread
From: Takashi Iwai @ 2019-02-05 16:05 UTC (permalink / raw)
  To: alsa-devel

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.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
 sound/drivers/opl4/opl4_proc.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/sound/drivers/opl4/opl4_proc.c b/sound/drivers/opl4/opl4_proc.c
index 16b24091d799..f1b839a0e7b7 100644
--- a/sound/drivers/opl4/opl4_proc.c
+++ b/sound/drivers/opl4/opl4_proc.c
@@ -114,10 +114,6 @@ int snd_opl4_create_proc(struct snd_opl4 *opl4)
 		entry->c.ops = &snd_opl4_mem_proc_ops;
 		entry->module = THIS_MODULE;
 		entry->private_data = opl4;
-		if (snd_info_register(entry) < 0) {
-			snd_info_free_entry(entry);
-			entry = NULL;
-		}
 	}
 	opl4->proc_entry = entry;
 	return 0;
-- 
2.16.4

^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [PATCH 3/3] ALSA: emux: Remove superfluous snd_info_register() calls
  2019-02-05 16:05 [PATCH 0/3] ALSA: Remove superfluous snd_info_register() calls Takashi Iwai
  2019-02-05 16:05 ` [PATCH 1/3] ALSA: firewire: " Takashi Iwai
  2019-02-05 16:05 ` [PATCH 2/3] ALSA: opl4: " Takashi Iwai
@ 2019-02-05 16:05 ` Takashi Iwai
  2 siblings, 0 replies; 7+ messages in thread
From: Takashi Iwai @ 2019-02-05 16:05 UTC (permalink / raw)
  To: alsa-devel

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.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
 sound/synth/emux/emux_proc.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/sound/synth/emux/emux_proc.c b/sound/synth/emux/emux_proc.c
index a82b4053bee8..c14781ac7941 100644
--- a/sound/synth/emux/emux_proc.c
+++ b/sound/synth/emux/emux_proc.c
@@ -115,10 +115,6 @@ void snd_emux_proc_init(struct snd_emux *emu, struct snd_card *card, int device)
 	entry->content = SNDRV_INFO_CONTENT_TEXT;
 	entry->private_data = emu;
 	entry->c.text.read = snd_emux_proc_info_read;
-	if (snd_info_register(entry) < 0)
-		snd_info_free_entry(entry);
-	else
-		emu->proc = entry;
 }
 
 void snd_emux_proc_free(struct snd_emux *emu)
-- 
2.16.4

^ permalink raw reply related	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2019-02-06 17:13 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-02-05 16:05 [PATCH 0/3] ALSA: Remove superfluous snd_info_register() calls Takashi Iwai
2019-02-05 16:05 ` [PATCH 1/3] ALSA: firewire: " Takashi Iwai
2019-02-06 14:33   ` Takashi Sakamoto
2019-02-06 15:38     ` Jaroslav Kysela
2019-02-06 17:13     ` Takashi Iwai
2019-02-05 16:05 ` [PATCH 2/3] ALSA: opl4: " Takashi Iwai
2019-02-05 16:05 ` [PATCH 3/3] ALSA: emux: " Takashi Iwai

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.