ALSA: i2c: 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/i2c/other/ak4113.c b/sound/i2c/other/ak4113.c
index 4099e6062d3c4992970bbb740c04e7d931b76516..573599d0378d28036f1648527e475bf2c53fd2ae 100644 (file)
--- a/sound/i2c/other/ak4113.c
+++ b/sound/i2c/other/ak4113.c
@@ -492,9 +492,8 @@ static void snd_ak4113_proc_regs_read(struct snd_info_entry *entry,
 
 static void snd_ak4113_proc_init(struct ak4113 *ak4113)
 {
-       struct snd_info_entry *entry;
-       if (!snd_card_proc_new(ak4113->card, "ak4113", &entry))
-               snd_info_set_text_ops(entry, ak4113, snd_ak4113_proc_regs_read);
+       snd_card_ro_proc_new(ak4113->card, "ak4113", ak4113,
+                            snd_ak4113_proc_regs_read);
 }
 
 int snd_ak4113_build(struct ak4113 *ak4113,

diff --git a/sound/i2c/other/ak4114.c b/sound/i2c/other/ak4114.c
index 7fb1aeb46915fa435c7d4934e22bca87f6a07cb3..76afb975782d5c7f0adedb59955ecb9d9c13917a 100644 (file)
--- a/sound/i2c/other/ak4114.c
+++ b/sound/i2c/other/ak4114.c
@@ -465,9 +465,8 @@ static void snd_ak4114_proc_regs_read(struct snd_info_entry *entry,
 
 static void snd_ak4114_proc_init(struct ak4114 *ak4114)
 {
-       struct snd_info_entry *entry;
-       if (!snd_card_proc_new(ak4114->card, "ak4114", &entry))
-               snd_info_set_text_ops(entry, ak4114, snd_ak4114_proc_regs_read);
+       snd_card_ro_proc_new(ak4114->card, "ak4114", ak4114,
+                            snd_ak4114_proc_regs_read);
 }
 
 int snd_ak4114_build(struct ak4114 *ak4114,

diff --git a/sound/i2c/other/ak4xxx-adda.c b/sound/i2c/other/ak4xxx-adda.c
index 7f2761a2e7c8c6f2ff6f62e5d2f59ac6aac785c3..62a6c5fa96b5d1922ee2e9fc589af4a36606547e 100644 (file)
--- a/sound/i2c/other/ak4xxx-adda.c
+++ b/sound/i2c/other/ak4xxx-adda.c
@@ -875,13 +875,7 @@ static void proc_regs_read(struct snd_info_entry *entry,
 
 static int proc_init(struct snd_akm4xxx *ak)
 {
-       struct snd_info_entry *entry;
-       int err;
-       err = snd_card_proc_new(ak->card, ak->name, &entry);
-       if (err < 0)
-               return err;
-       snd_info_set_text_ops(entry, ak, proc_regs_read);
-       return 0;
+       return snd_card_ro_proc_new(ak->card, ak->name, ak, proc_regs_read);
 }
 
 int snd_akm4xxx_build_controls(struct snd_akm4xxx *ak)