From: Takashi Iwai <tiwai@suse.de>
To: alsa-devel@alsa-project.org
Subject: [PATCH 01/11] ALSA: pcm: Remove superfluous snd_info_register() calls
Date: Mon, 4 Feb 2019 16:20:26 +0100 [thread overview]
Message-ID: <20190204152036.14102-2-tiwai@suse.de> (raw)
In-Reply-To: <20190204152036.14102-1-tiwai@suse.de>
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 cleaning up the calls of substream proc
entries with a common helper.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
sound/core/pcm.c | 79 +++++++++++++++++++-------------------------------------
1 file changed, 26 insertions(+), 53 deletions(-)
diff --git a/sound/core/pcm.c b/sound/core/pcm.c
index 4f45b3000347..a49c866541cb 100644
--- a/sound/core/pcm.c
+++ b/sound/core/pcm.c
@@ -528,18 +528,10 @@ static int snd_pcm_stream_proc_init(struct snd_pcm_str *pstr)
if (!entry)
return -ENOMEM;
entry->mode = S_IFDIR | 0555;
- if (snd_info_register(entry) < 0) {
- snd_info_free_entry(entry);
- return -ENOMEM;
- }
pstr->proc_root = entry;
entry = snd_info_create_card_entry(pcm->card, "info", pstr->proc_root);
- if (entry) {
+ if (entry)
snd_info_set_text_ops(entry, pstr, snd_pcm_stream_proc_info_read);
- if (snd_info_register(entry) < 0)
- snd_info_free_entry(entry);
- }
-
#ifdef CONFIG_SND_PCM_XRUN_DEBUG
entry = snd_info_create_card_entry(pcm->card, "xrun_debug",
pstr->proc_root);
@@ -547,9 +539,6 @@ static int snd_pcm_stream_proc_init(struct snd_pcm_str *pstr)
entry->c.text.read = snd_pcm_xrun_debug_read;
entry->c.text.write = snd_pcm_xrun_debug_write;
entry->mode |= 0200;
- entry->private_data = pstr;
- if (snd_info_register(entry) < 0)
- snd_info_free_entry(entry);
}
#endif
return 0;
@@ -562,6 +551,21 @@ static int snd_pcm_stream_proc_done(struct snd_pcm_str *pstr)
return 0;
}
+static struct snd_info_entry *
+create_substream_info_entry(struct snd_pcm_substream *substream,
+ const char *name,
+ void (*read)(struct snd_info_entry *,
+ struct snd_info_buffer *))
+{
+ struct snd_info_entry *entry;
+
+ entry = snd_info_create_card_entry(substream->pcm->card, name,
+ substream->proc_root);
+ if (entry)
+ snd_info_set_text_ops(entry, substream, read);
+ return entry;
+}
+
static int snd_pcm_substream_proc_init(struct snd_pcm_substream *substream)
{
struct snd_info_entry *entry;
@@ -576,53 +580,22 @@ static int snd_pcm_substream_proc_init(struct snd_pcm_substream *substream)
if (!entry)
return -ENOMEM;
entry->mode = S_IFDIR | 0555;
- if (snd_info_register(entry) < 0) {
- snd_info_free_entry(entry);
- return -ENOMEM;
- }
substream->proc_root = entry;
- entry = snd_info_create_card_entry(card, "info", substream->proc_root);
- if (entry) {
- snd_info_set_text_ops(entry, substream,
- snd_pcm_substream_proc_info_read);
- if (snd_info_register(entry) < 0)
- snd_info_free_entry(entry);
- }
- entry = snd_info_create_card_entry(card, "hw_params",
- substream->proc_root);
- if (entry) {
- snd_info_set_text_ops(entry, substream,
- snd_pcm_substream_proc_hw_params_read);
- if (snd_info_register(entry) < 0)
- snd_info_free_entry(entry);
- }
- entry = snd_info_create_card_entry(card, "sw_params",
- substream->proc_root);
- if (entry) {
- snd_info_set_text_ops(entry, substream,
- snd_pcm_substream_proc_sw_params_read);
- if (snd_info_register(entry) < 0)
- snd_info_free_entry(entry);
- }
- entry = snd_info_create_card_entry(card, "status",
- substream->proc_root);
- if (entry) {
- snd_info_set_text_ops(entry, substream,
- snd_pcm_substream_proc_status_read);
- if (snd_info_register(entry) < 0)
- snd_info_free_entry(entry);
- }
+
+ create_substream_info_entry(substream, "info",
+ snd_pcm_substream_proc_info_read);
+ create_substream_info_entry(substream, "hw_params",
+ snd_pcm_substream_proc_hw_params_read);
+ create_substream_info_entry(substream, "sw_params",
+ snd_pcm_substream_proc_sw_params_read);
+ create_substream_info_entry(substream, "status",
+ snd_pcm_substream_proc_status_read);
#ifdef CONFIG_SND_PCM_XRUN_DEBUG
- entry = snd_info_create_card_entry(card, "xrun_injection",
- substream->proc_root);
+ entry = create_substream_info_entry(substream, "xrun_injection", NULL);
if (entry) {
- entry->private_data = substream;
- entry->c.text.read = NULL;
entry->c.text.write = snd_pcm_xrun_injection_write;
entry->mode = S_IFREG | 0200;
- if (snd_info_register(entry) < 0)
- snd_info_free_entry(entry);
}
#endif /* CONFIG_SND_PCM_XRUN_DEBUG */
--
2.16.4
next prev parent reply other threads:[~2019-02-04 15:20 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-04 15:20 [PATCH 00/11] ALSA: procfs cleanups Takashi Iwai
2019-02-04 15:20 ` Takashi Iwai [this message]
2019-02-04 15:20 ` [PATCH 02/11] ALSA: compress: Remove superfluous snd_info_register() calls Takashi Iwai
2019-02-04 15:20 ` [PATCH 03/11] ALSA: pci: " Takashi Iwai
2019-02-04 15:20 ` [PATCH 04/11] ALSA: info: Add standard helpers for card proc file entries Takashi Iwai
2019-02-04 15:20 ` [PATCH 05/11] ALSA: drivers: Clean up with new procfs helpers Takashi Iwai
2019-02-04 15:20 ` [PATCH 06/11] ALSA: isa: " Takashi Iwai
2019-02-04 15:20 ` [PATCH 07/11] ALSA: i2c: " Takashi Iwai
2019-02-04 15:20 ` [PATCH 08/11] ALSA: pci: " Takashi Iwai
2019-02-04 15:20 ` [PATCH 09/11] ALSA: pcmcia: " Takashi Iwai
2019-02-04 15:20 ` [PATCH 10/11] ALSA: sparc: " Takashi Iwai
2019-02-04 15:20 ` [PATCH 11/11] ALSA: usb: " Takashi Iwai
2019-02-04 18:40 ` [PATCH 00/11] ALSA: procfs cleanups Jaroslav Kysela
2019-02-05 15:58 ` Takashi Iwai
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190204152036.14102-2-tiwai@suse.de \
--to=tiwai@suse.de \
--cc=alsa-devel@alsa-project.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.