ALSA: drivers: Clean up with new procfs helpers

Simplify the proc fs creation code with new helper functions,
snd_card_ro_proc_new() and snd_card_rw_proc_new().
Just a code refactoring and no functional changes.

Reviewed-by: Jaroslav Kysela <perex@perex.cz>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/drivers/aloop.c b/sound/drivers/aloop.c
index 65c903b639c2d13a70c2f9349f48a752219ab93b..8c3fbe1276be141c79af15acba98287ac8ebf46b 100644 (file)
--- a/sound/drivers/aloop.c
+++ b/sound/drivers/aloop.c
@@ -1133,16 +1133,10 @@ static void print_cable_info(struct snd_info_entry *entry,
 static int loopback_proc_new(struct loopback *loopback, int cidx)
 {
        char name[32];
-       struct snd_info_entry *entry;
-       int err;
 
        snprintf(name, sizeof(name), "cable#%d", cidx);
-       err = snd_card_proc_new(loopback->card, name, &entry);
-       if (err < 0)
-               return err;
-
-       snd_info_set_text_ops(entry, loopback, print_cable_info);
-       return 0;
+       return snd_card_ro_proc_new(loopback->card, name, loopback,
+                                   print_cable_info);
 }
 
 static int loopback_probe(struct platform_device *devptr)

diff --git a/sound/drivers/dummy.c b/sound/drivers/dummy.c
index c8d31550e9a1f20dd89a936637199065d9c2916a..2672c2e13334dd99e959bf74fce5dd0a9692c3ae 100644 (file)
--- a/sound/drivers/dummy.c
+++ b/sound/drivers/dummy.c
@@ -1037,14 +1037,8 @@ static void dummy_proc_write(struct snd_info_entry *entry,
 
 static void dummy_proc_init(struct snd_dummy *chip)
 {
-       struct snd_info_entry *entry;
-
-       if (!snd_card_proc_new(chip->card, "dummy_pcm", &entry)) {
-               snd_info_set_text_ops(entry, chip, dummy_proc_read);
-               entry->c.text.write = dummy_proc_write;
-               entry->mode |= 0200;
-               entry->private_data = chip;
-       }
+       snd_card_rw_proc_new(chip->card, "dummy_pcm", chip,
+                            dummy_proc_read, dummy_proc_write);
 }
 #else
 #define dummy_proc_init(x)

diff --git a/sound/drivers/vx/vx_core.c b/sound/drivers/vx/vx_core.c
index 19496fa486aa16126113300e4f601d8e7d273812..543945643a76604faddbb81cb18ef2c469271271 100644 (file)
--- a/sound/drivers/vx/vx_core.c
+++ b/sound/drivers/vx/vx_core.c
@@ -643,10 +643,7 @@ static void vx_proc_read(struct snd_info_entry *entry, struct snd_info_buffer *b
 
 static void vx_proc_init(struct vx_core *chip)
 {
-       struct snd_info_entry *entry;
-
-       if (! snd_card_proc_new(chip->card, "vx-status", &entry))
-               snd_info_set_text_ops(entry, chip, vx_proc_read);
+       snd_card_ro_proc_new(chip->card, "vx-status", chip, vx_proc_read);
 }