aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl19
-rw-r--r--include/sound/info.h5
-rw-r--r--sound/core/hwdep.c1
-rw-r--r--sound/core/info_oss.c1
-rw-r--r--sound/core/init.c3
-rw-r--r--sound/core/oss/mixer_oss.c2
-rw-r--r--sound/core/oss/pcm_oss.c2
-rw-r--r--sound/core/pcm.c19
-rw-r--r--sound/core/pcm_memory.c2
-rw-r--r--sound/core/rawmidi.c1
-rw-r--r--sound/core/seq/oss/seq_oss.c1
-rw-r--r--sound/core/seq/seq_device.c1
-rw-r--r--sound/core/seq/seq_info.c11
-rw-r--r--sound/core/sound.c1
-rw-r--r--sound/core/sound_oss.c1
-rw-r--r--sound/core/timer.c1
-rw-r--r--sound/drivers/vx/vx_core.c2
-rw-r--r--sound/i2c/l3/uda1341.c4
-rw-r--r--sound/isa/gus/gus_irq.c2
-rw-r--r--sound/isa/gus/gus_mem.c6
-rw-r--r--sound/isa/opti9xx/miro.c2
-rw-r--r--sound/isa/sb/sb16_csp.c2
-rw-r--r--sound/pci/ac97/ac97_proc.c5
-rw-r--r--sound/pci/ac97/ak4531_codec.c2
-rw-r--r--sound/pci/ad1889.c2
-rw-r--r--sound/pci/ali5451/ali5451.c2
-rw-r--r--sound/pci/atiixp.c2
-rw-r--r--sound/pci/atiixp_modem.c2
-rw-r--r--sound/pci/ca0106/ca0106_proc.c17
-rw-r--r--sound/pci/cmipci.c2
-rw-r--r--sound/pci/cs4281.c2
-rw-r--r--sound/pci/cs46xx/dsp_spos.c7
-rw-r--r--sound/pci/cs46xx/dsp_spos_scb_lib.c1
-rw-r--r--sound/pci/emu10k1/emu10k1x.c3
-rw-r--r--sound/pci/emu10k1/emuproc.c27
-rw-r--r--sound/pci/ens1370.c2
-rw-r--r--sound/pci/hda/hda_proc.c2
-rw-r--r--sound/pci/ice1712/ice1712.c2
-rw-r--r--sound/pci/ice1712/ice1724.c2
-rw-r--r--sound/pci/ice1712/pontis.c8
-rw-r--r--sound/pci/intel8x0.c2
-rw-r--r--sound/pci/intel8x0m.c2
-rw-r--r--sound/pci/korg1212/korg1212.c2
-rw-r--r--sound/pci/mixart/mixart.c1
-rw-r--r--sound/pci/pcxhr/pcxhr.c4
-rw-r--r--sound/pci/riptide/riptide.c2
-rw-r--r--sound/pci/rme32.c2
-rw-r--r--sound/pci/rme96.c2
-rw-r--r--sound/pci/rme9652/hdsp.c2
-rw-r--r--sound/pci/rme9652/hdspm.c2
-rw-r--r--sound/pci/rme9652/rme9652.c2
-rw-r--r--sound/pci/sonicvibes.c2
-rw-r--r--sound/pci/trident/trident_main.c2
-rw-r--r--sound/pci/via82xx.c2
-rw-r--r--sound/pci/via82xx_modem.c2
-rw-r--r--sound/pci/ymfpci/ymfpci_main.c2
-rw-r--r--sound/pcmcia/pdaudiocf/pdaudiocf_core.c2
-rw-r--r--sound/sparc/dbri.c4
-rw-r--r--sound/synth/emux/emux_proc.c1
-rw-r--r--sound/usb/usbaudio.c6
-rw-r--r--sound/usb/usbmixer.c2
61 files changed, 81 insertions, 146 deletions
diff --git a/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl b/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl
index 1faf76383bab..db557f91ab79 100644
--- a/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl
+++ b/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl
@@ -5333,7 +5333,7 @@ struct _snd_pcm_runtime {
5333 <informalexample> 5333 <informalexample>
5334 <programlisting> 5334 <programlisting>
5335<![CDATA[ 5335<![CDATA[
5336 snd_info_set_text_ops(entry, chip, read_size, my_proc_read); 5336 snd_info_set_text_ops(entry, chip, my_proc_read);
5337]]> 5337]]>
5338 </programlisting> 5338 </programlisting>
5339 </informalexample> 5339 </informalexample>
@@ -5394,7 +5394,6 @@ struct _snd_pcm_runtime {
5394 <informalexample> 5394 <informalexample>
5395 <programlisting> 5395 <programlisting>
5396<![CDATA[ 5396<![CDATA[
5397 entry->c.text.write_size = 256;
5398 entry->c.text.write = my_proc_write; 5397 entry->c.text.write = my_proc_write;
5399]]> 5398]]>
5400 </programlisting> 5399 </programlisting>
@@ -5402,22 +5401,6 @@ struct _snd_pcm_runtime {
5402 </para> 5401 </para>
5403 5402
5404 <para> 5403 <para>
5405 The buffer size for read is set to 1024 implicitly by
5406 <function>snd_info_set_text_ops()</function>. It should suffice
5407 in most cases (the size will be aligned to
5408 <constant>PAGE_SIZE</constant> anyway), but if you need to handle
5409 very large text files, you can set it explicitly, too.
5410
5411 <informalexample>
5412 <programlisting>
5413<![CDATA[
5414 entry->c.text.read_size = 65536;
5415]]>
5416 </programlisting>
5417 </informalexample>
5418 </para>
5419
5420 <para>
5421 For the write callback, you can use 5404 For the write callback, you can use
5422 <function>snd_info_get_line()</function> to get a text line, and 5405 <function>snd_info_get_line()</function> to get a text line, and
5423 <function>snd_info_get_str()</function> to retrieve a string from 5406 <function>snd_info_get_str()</function> to retrieve a string from
diff --git a/include/sound/info.h b/include/sound/info.h
index 481284389855..74f6996769c7 100644
--- a/include/sound/info.h
+++ b/include/sound/info.h
@@ -40,8 +40,6 @@ struct snd_info_buffer {
40struct snd_info_entry; 40struct snd_info_entry;
41 41
42struct snd_info_entry_text { 42struct snd_info_entry_text {
43 unsigned long read_size;
44 unsigned long write_size;
45 void (*read) (struct snd_info_entry *entry, struct snd_info_buffer *buffer); 43 void (*read) (struct snd_info_entry *entry, struct snd_info_buffer *buffer);
46 void (*write) (struct snd_info_entry *entry, struct snd_info_buffer *buffer); 44 void (*write) (struct snd_info_entry *entry, struct snd_info_buffer *buffer);
47}; 45};
@@ -132,11 +130,9 @@ int snd_card_proc_new(struct snd_card *card, const char *name, struct snd_info_e
132 130
133static inline void snd_info_set_text_ops(struct snd_info_entry *entry, 131static inline void snd_info_set_text_ops(struct snd_info_entry *entry,
134 void *private_data, 132 void *private_data,
135 long read_size,
136 void (*read)(struct snd_info_entry *, struct snd_info_buffer *)) 133 void (*read)(struct snd_info_entry *, struct snd_info_buffer *))
137{ 134{
138 entry->private_data = private_data; 135 entry->private_data = private_data;
139 entry->c.text.read_size = read_size;
140 entry->c.text.read = read; 136 entry->c.text.read = read;
141} 137}
142 138
@@ -167,7 +163,6 @@ static inline int snd_card_proc_new(struct snd_card *card, const char *name,
167 struct snd_info_entry **entryp) { return -EINVAL; } 163 struct snd_info_entry **entryp) { return -EINVAL; }
168static inline void snd_info_set_text_ops(struct snd_info_entry *entry __attribute__((unused)), 164static inline void snd_info_set_text_ops(struct snd_info_entry *entry __attribute__((unused)),
169 void *private_data, 165 void *private_data,
170 long read_size,
171 void (*read)(struct snd_info_entry *, struct snd_info_buffer *)) {} 166 void (*read)(struct snd_info_entry *, struct snd_info_buffer *)) {}
172 167
173static inline int snd_info_check_reserved_words(const char *str) { return 1; } 168static inline int snd_info_check_reserved_words(const char *str) { return 1; }
diff --git a/sound/core/hwdep.c b/sound/core/hwdep.c
index 2524e66eccdd..8bd0dcc93eba 100644
--- a/sound/core/hwdep.c
+++ b/sound/core/hwdep.c
@@ -486,7 +486,6 @@ static void __init snd_hwdep_proc_init(void)
486 struct snd_info_entry *entry; 486 struct snd_info_entry *entry;
487 487
488 if ((entry = snd_info_create_module_entry(THIS_MODULE, "hwdep", NULL)) != NULL) { 488 if ((entry = snd_info_create_module_entry(THIS_MODULE, "hwdep", NULL)) != NULL) {
489 entry->c.text.read_size = PAGE_SIZE;
490 entry->c.text.read = snd_hwdep_proc_read; 489 entry->c.text.read = snd_hwdep_proc_read;
491 if (snd_info_register(entry) < 0) { 490 if (snd_info_register(entry) < 0) {
492 snd_info_free_entry(entry); 491 snd_info_free_entry(entry);
diff --git a/sound/core/info_oss.c b/sound/core/info_oss.c
index f2efca18728c..bb2c40d0ab66 100644
--- a/sound/core/info_oss.c
+++ b/sound/core/info_oss.c
@@ -119,7 +119,6 @@ int snd_info_minor_register(void)
119 119
120 memset(snd_sndstat_strings, 0, sizeof(snd_sndstat_strings)); 120 memset(snd_sndstat_strings, 0, sizeof(snd_sndstat_strings));
121 if ((entry = snd_info_create_module_entry(THIS_MODULE, "sndstat", snd_oss_root)) != NULL) { 121 if ((entry = snd_info_create_module_entry(THIS_MODULE, "sndstat", snd_oss_root)) != NULL) {
122 entry->c.text.read_size = 2048;
123 entry->c.text.read = snd_sndstat_proc_read; 122 entry->c.text.read = snd_sndstat_proc_read;
124 if (snd_info_register(entry) < 0) { 123 if (snd_info_register(entry) < 0) {
125 snd_info_free_entry(entry); 124 snd_info_free_entry(entry);
diff --git a/sound/core/init.c b/sound/core/init.c
index b145d17ba3b2..2ff0e5e90865 100644
--- a/sound/core/init.c
+++ b/sound/core/init.c
@@ -69,7 +69,6 @@ static inline int init_info_for_card(struct snd_card *card)
69 snd_printd("unable to create card entry\n"); 69 snd_printd("unable to create card entry\n");
70 return err; 70 return err;
71 } 71 }
72 entry->c.text.read_size = PAGE_SIZE;
73 entry->c.text.read = snd_card_id_read; 72 entry->c.text.read = snd_card_id_read;
74 if (snd_info_register(entry) < 0) { 73 if (snd_info_register(entry) < 0) {
75 snd_info_free_entry(entry); 74 snd_info_free_entry(entry);
@@ -592,7 +591,6 @@ int __init snd_card_info_init(void)
592 entry = snd_info_create_module_entry(THIS_MODULE, "cards", NULL); 591 entry = snd_info_create_module_entry(THIS_MODULE, "cards", NULL);
593 if (! entry) 592 if (! entry)
594 return -ENOMEM; 593 return -ENOMEM;
595 entry->c.text.read_size = PAGE_SIZE;
596 entry->c.text.read = snd_card_info_read; 594 entry->c.text.read = snd_card_info_read;
597 if (snd_info_register(entry) < 0) { 595 if (snd_info_register(entry) < 0) {
598 snd_info_free_entry(entry); 596 snd_info_free_entry(entry);
@@ -603,7 +601,6 @@ int __init snd_card_info_init(void)
603#ifdef MODULE 601#ifdef MODULE
604 entry = snd_info_create_module_entry(THIS_MODULE, "modules", NULL); 602 entry = snd_info_create_module_entry(THIS_MODULE, "modules", NULL);
605 if (entry) { 603 if (entry) {
606 entry->c.text.read_size = PAGE_SIZE;
607 entry->c.text.read = snd_card_module_info_read; 604 entry->c.text.read = snd_card_module_info_read;
608 if (snd_info_register(entry) < 0) 605 if (snd_info_register(entry) < 0)
609 snd_info_free_entry(entry); 606 snd_info_free_entry(entry);
diff --git a/sound/core/oss/mixer_oss.c b/sound/core/oss/mixer_oss.c
index 9c68bc3f97aa..71b5080fa66d 100644
--- a/sound/core/oss/mixer_oss.c
+++ b/sound/core/oss/mixer_oss.c
@@ -1182,9 +1182,7 @@ static void snd_mixer_oss_proc_init(struct snd_mixer_oss *mixer)
1182 return; 1182 return;
1183 entry->content = SNDRV_INFO_CONTENT_TEXT; 1183 entry->content = SNDRV_INFO_CONTENT_TEXT;
1184 entry->mode = S_IFREG | S_IRUGO | S_IWUSR; 1184 entry->mode = S_IFREG | S_IRUGO | S_IWUSR;
1185 entry->c.text.read_size = 8192;
1186 entry->c.text.read = snd_mixer_oss_proc_read; 1185 entry->c.text.read = snd_mixer_oss_proc_read;
1187 entry->c.text.write_size = 8192;
1188 entry->c.text.write = snd_mixer_oss_proc_write; 1186 entry->c.text.write = snd_mixer_oss_proc_write;
1189 entry->private_data = mixer; 1187 entry->private_data = mixer;
1190 if (snd_info_register(entry) < 0) { 1188 if (snd_info_register(entry) < 0) {
diff --git a/sound/core/oss/pcm_oss.c b/sound/core/oss/pcm_oss.c
index 0d2e232afe6c..d8b7416ee003 100644
--- a/sound/core/oss/pcm_oss.c
+++ b/sound/core/oss/pcm_oss.c
@@ -2823,9 +2823,7 @@ static void snd_pcm_oss_proc_init(struct snd_pcm *pcm)
2823 if ((entry = snd_info_create_card_entry(pcm->card, "oss", pstr->proc_root)) != NULL) { 2823 if ((entry = snd_info_create_card_entry(pcm->card, "oss", pstr->proc_root)) != NULL) {
2824 entry->content = SNDRV_INFO_CONTENT_TEXT; 2824 entry->content = SNDRV_INFO_CONTENT_TEXT;
2825 entry->mode = S_IFREG | S_IRUGO | S_IWUSR; 2825 entry->mode = S_IFREG | S_IRUGO | S_IWUSR;
2826 entry->c.text.read_size = 8192;
2827 entry->c.text.read = snd_pcm_oss_proc_read; 2826 entry->c.text.read = snd_pcm_oss_proc_read;
2828 entry->c.text.write_size = 8192;
2829 entry->c.text.write = snd_pcm_oss_proc_write; 2827 entry->c.text.write = snd_pcm_oss_proc_write;
2830 entry->private_data = pstr; 2828 entry->private_data = pstr;
2831 if (snd_info_register(entry) < 0) { 2829 if (snd_info_register(entry) < 0) {
diff --git a/sound/core/pcm.c b/sound/core/pcm.c
index 8c15c01907f4..08223783cfa3 100644
--- a/sound/core/pcm.c
+++ b/sound/core/pcm.c
@@ -472,7 +472,7 @@ static int snd_pcm_stream_proc_init(struct snd_pcm_str *pstr)
472 pstr->proc_root = entry; 472 pstr->proc_root = entry;
473 473
474 if ((entry = snd_info_create_card_entry(pcm->card, "info", pstr->proc_root)) != NULL) { 474 if ((entry = snd_info_create_card_entry(pcm->card, "info", pstr->proc_root)) != NULL) {
475 snd_info_set_text_ops(entry, pstr, 256, snd_pcm_stream_proc_info_read); 475 snd_info_set_text_ops(entry, pstr, snd_pcm_stream_proc_info_read);
476 if (snd_info_register(entry) < 0) { 476 if (snd_info_register(entry) < 0) {
477 snd_info_free_entry(entry); 477 snd_info_free_entry(entry);
478 entry = NULL; 478 entry = NULL;
@@ -483,9 +483,7 @@ static int snd_pcm_stream_proc_init(struct snd_pcm_str *pstr)
483#ifdef CONFIG_SND_PCM_XRUN_DEBUG 483#ifdef CONFIG_SND_PCM_XRUN_DEBUG
484 if ((entry = snd_info_create_card_entry(pcm->card, "xrun_debug", 484 if ((entry = snd_info_create_card_entry(pcm->card, "xrun_debug",
485 pstr->proc_root)) != NULL) { 485 pstr->proc_root)) != NULL) {
486 entry->c.text.read_size = 64;
487 entry->c.text.read = snd_pcm_xrun_debug_read; 486 entry->c.text.read = snd_pcm_xrun_debug_read;
488 entry->c.text.write_size = 64;
489 entry->c.text.write = snd_pcm_xrun_debug_write; 487 entry->c.text.write = snd_pcm_xrun_debug_write;
490 entry->mode |= S_IWUSR; 488 entry->mode |= S_IWUSR;
491 entry->private_data = pstr; 489 entry->private_data = pstr;
@@ -537,7 +535,8 @@ static int snd_pcm_substream_proc_init(struct snd_pcm_substream *substream)
537 substream->proc_root = entry; 535 substream->proc_root = entry;
538 536
539 if ((entry = snd_info_create_card_entry(card, "info", substream->proc_root)) != NULL) { 537 if ((entry = snd_info_create_card_entry(card, "info", substream->proc_root)) != NULL) {
540 snd_info_set_text_ops(entry, substream, 256, snd_pcm_substream_proc_info_read); 538 snd_info_set_text_ops(entry, substream,
539 snd_pcm_substream_proc_info_read);
541 if (snd_info_register(entry) < 0) { 540 if (snd_info_register(entry) < 0) {
542 snd_info_free_entry(entry); 541 snd_info_free_entry(entry);
543 entry = NULL; 542 entry = NULL;
@@ -546,7 +545,8 @@ static int snd_pcm_substream_proc_init(struct snd_pcm_substream *substream)
546 substream->proc_info_entry = entry; 545 substream->proc_info_entry = entry;
547 546
548 if ((entry = snd_info_create_card_entry(card, "hw_params", substream->proc_root)) != NULL) { 547 if ((entry = snd_info_create_card_entry(card, "hw_params", substream->proc_root)) != NULL) {
549 snd_info_set_text_ops(entry, substream, 256, snd_pcm_substream_proc_hw_params_read); 548 snd_info_set_text_ops(entry, substream,
549 snd_pcm_substream_proc_hw_params_read);
550 if (snd_info_register(entry) < 0) { 550 if (snd_info_register(entry) < 0) {
551 snd_info_free_entry(entry); 551 snd_info_free_entry(entry);
552 entry = NULL; 552 entry = NULL;
@@ -555,7 +555,8 @@ static int snd_pcm_substream_proc_init(struct snd_pcm_substream *substream)
555 substream->proc_hw_params_entry = entry; 555 substream->proc_hw_params_entry = entry;
556 556
557 if ((entry = snd_info_create_card_entry(card, "sw_params", substream->proc_root)) != NULL) { 557 if ((entry = snd_info_create_card_entry(card, "sw_params", substream->proc_root)) != NULL) {
558 snd_info_set_text_ops(entry, substream, 256, snd_pcm_substream_proc_sw_params_read); 558 snd_info_set_text_ops(entry, substream,
559 snd_pcm_substream_proc_sw_params_read);
559 if (snd_info_register(entry) < 0) { 560 if (snd_info_register(entry) < 0) {
560 snd_info_free_entry(entry); 561 snd_info_free_entry(entry);
561 entry = NULL; 562 entry = NULL;
@@ -564,7 +565,8 @@ static int snd_pcm_substream_proc_init(struct snd_pcm_substream *substream)
564 substream->proc_sw_params_entry = entry; 565 substream->proc_sw_params_entry = entry;
565 566
566 if ((entry = snd_info_create_card_entry(card, "status", substream->proc_root)) != NULL) { 567 if ((entry = snd_info_create_card_entry(card, "status", substream->proc_root)) != NULL) {
567 snd_info_set_text_ops(entry, substream, 256, snd_pcm_substream_proc_status_read); 568 snd_info_set_text_ops(entry, substream,
569 snd_pcm_substream_proc_status_read);
568 if (snd_info_register(entry) < 0) { 570 if (snd_info_register(entry) < 0) {
569 snd_info_free_entry(entry); 571 snd_info_free_entry(entry);
570 entry = NULL; 572 entry = NULL;
@@ -1062,8 +1064,7 @@ static void snd_pcm_proc_init(void)
1062 struct snd_info_entry *entry; 1064 struct snd_info_entry *entry;
1063 1065
1064 if ((entry = snd_info_create_module_entry(THIS_MODULE, "pcm", NULL)) != NULL) { 1066 if ((entry = snd_info_create_module_entry(THIS_MODULE, "pcm", NULL)) != NULL) {
1065 snd_info_set_text_ops(entry, NULL, SNDRV_CARDS * SNDRV_PCM_DEVICES * 128, 1067 snd_info_set_text_ops(entry, NULL, snd_pcm_proc_read);
1066 snd_pcm_proc_read);
1067 if (snd_info_register(entry) < 0) { 1068 if (snd_info_register(entry) < 0) {
1068 snd_info_free_entry(entry); 1069 snd_info_free_entry(entry);
1069 entry = NULL; 1070 entry = NULL;
diff --git a/sound/core/pcm_memory.c b/sound/core/pcm_memory.c
index eb56167d3bb4..067d2056db9a 100644
--- a/sound/core/pcm_memory.c
+++ b/sound/core/pcm_memory.c
@@ -193,9 +193,7 @@ static inline void preallocate_info_init(struct snd_pcm_substream *substream)
193 struct snd_info_entry *entry; 193 struct snd_info_entry *entry;
194 194
195 if ((entry = snd_info_create_card_entry(substream->pcm->card, "prealloc", substream->proc_root)) != NULL) { 195 if ((entry = snd_info_create_card_entry(substream->pcm->card, "prealloc", substream->proc_root)) != NULL) {
196 entry->c.text.read_size = 64;
197 entry->c.text.read = snd_pcm_lib_preallocate_proc_read; 196 entry->c.text.read = snd_pcm_lib_preallocate_proc_read;
198 entry->c.text.write_size = 64;
199 entry->c.text.write = snd_pcm_lib_preallocate_proc_write; 197 entry->c.text.write = snd_pcm_lib_preallocate_proc_write;
200 entry->mode |= S_IWUSR; 198 entry->mode |= S_IWUSR;
201 entry->private_data = substream; 199 entry->private_data = substream;
diff --git a/sound/core/rawmidi.c b/sound/core/rawmidi.c
index 87b47c9564f7..08a41e5023cd 100644
--- a/sound/core/rawmidi.c
+++ b/sound/core/rawmidi.c
@@ -1561,7 +1561,6 @@ static int snd_rawmidi_dev_register(struct snd_device *device)
1561 entry = snd_info_create_card_entry(rmidi->card, name, rmidi->card->proc_root); 1561 entry = snd_info_create_card_entry(rmidi->card, name, rmidi->card->proc_root);
1562 if (entry) { 1562 if (entry) {
1563 entry->private_data = rmidi; 1563 entry->private_data = rmidi;
1564 entry->c.text.read_size = 1024;
1565 entry->c.text.read = snd_rawmidi_proc_info_read; 1564 entry->c.text.read = snd_rawmidi_proc_info_read;
1566 if (snd_info_register(entry) < 0) { 1565 if (snd_info_register(entry) < 0) {
1567 snd_info_free_entry(entry); 1566 snd_info_free_entry(entry);
diff --git a/sound/core/seq/oss/seq_oss.c b/sound/core/seq/oss/seq_oss.c
index b9919785180b..e7234135641c 100644
--- a/sound/core/seq/oss/seq_oss.c
+++ b/sound/core/seq/oss/seq_oss.c
@@ -291,7 +291,6 @@ register_proc(void)
291 291
292 entry->content = SNDRV_INFO_CONTENT_TEXT; 292 entry->content = SNDRV_INFO_CONTENT_TEXT;
293 entry->private_data = NULL; 293 entry->private_data = NULL;
294 entry->c.text.read_size = 1024;
295 entry->c.text.read = info_read; 294 entry->c.text.read = info_read;
296 if (snd_info_register(entry) < 0) { 295 if (snd_info_register(entry) < 0) {
297 snd_info_free_entry(entry); 296 snd_info_free_entry(entry);
diff --git a/sound/core/seq/seq_device.c b/sound/core/seq/seq_device.c
index d9a3e5a18d6a..1e4bc402f00f 100644
--- a/sound/core/seq/seq_device.c
+++ b/sound/core/seq/seq_device.c
@@ -555,7 +555,6 @@ static int __init alsa_seq_device_init(void)
555 if (info_entry == NULL) 555 if (info_entry == NULL)
556 return -ENOMEM; 556 return -ENOMEM;
557 info_entry->content = SNDRV_INFO_CONTENT_TEXT; 557 info_entry->content = SNDRV_INFO_CONTENT_TEXT;
558 info_entry->c.text.read_size = 2048;
559 info_entry->c.text.read = snd_seq_device_info; 558 info_entry->c.text.read = snd_seq_device_info;
560 if (snd_info_register(info_entry) < 0) { 559 if (snd_info_register(info_entry) < 0) {
561 snd_info_free_entry(info_entry); 560 snd_info_free_entry(info_entry);
diff --git a/sound/core/seq/seq_info.c b/sound/core/seq/seq_info.c
index acce21afdaa4..142e9e6882c9 100644
--- a/sound/core/seq/seq_info.c
+++ b/sound/core/seq/seq_info.c
@@ -34,8 +34,8 @@ static struct snd_info_entry *timer_entry;
34 34
35 35
36static struct snd_info_entry * __init 36static struct snd_info_entry * __init
37create_info_entry(char *name, int size, void (*read)(struct snd_info_entry *, 37create_info_entry(char *name, void (*read)(struct snd_info_entry *,
38 struct snd_info_buffer *)) 38 struct snd_info_buffer *))
39{ 39{
40 struct snd_info_entry *entry; 40 struct snd_info_entry *entry;
41 41
@@ -43,7 +43,6 @@ create_info_entry(char *name, int size, void (*read)(struct snd_info_entry *,
43 if (entry == NULL) 43 if (entry == NULL)
44 return NULL; 44 return NULL;
45 entry->content = SNDRV_INFO_CONTENT_TEXT; 45 entry->content = SNDRV_INFO_CONTENT_TEXT;
46 entry->c.text.read_size = size;
47 entry->c.text.read = read; 46 entry->c.text.read = read;
48 if (snd_info_register(entry) < 0) { 47 if (snd_info_register(entry) < 0) {
49 snd_info_free_entry(entry); 48 snd_info_free_entry(entry);
@@ -55,11 +54,11 @@ create_info_entry(char *name, int size, void (*read)(struct snd_info_entry *,
55/* create all our /proc entries */ 54/* create all our /proc entries */
56int __init snd_seq_info_init(void) 55int __init snd_seq_info_init(void)
57{ 56{
58 queues_entry = create_info_entry("queues", 512 + (256 * SNDRV_SEQ_MAX_QUEUES), 57 queues_entry = create_info_entry("queues",
59 snd_seq_info_queues_read); 58 snd_seq_info_queues_read);
60 clients_entry = create_info_entry("clients", 512 + (256 * SNDRV_SEQ_MAX_CLIENTS), 59 clients_entry = create_info_entry("clients",
61 snd_seq_info_clients_read); 60 snd_seq_info_clients_read);
62 timer_entry = create_info_entry("timer", 1024, snd_seq_info_timer_read); 61 timer_entry = create_info_entry("timer", snd_seq_info_timer_read);
63 return 0; 62 return 0;
64} 63}
65 64
diff --git a/sound/core/sound.c b/sound/core/sound.c
index 67cfa06062b8..8313f97907d8 100644
--- a/sound/core/sound.c
+++ b/sound/core/sound.c
@@ -392,7 +392,6 @@ int __init snd_minor_info_init(void)
392 392
393 entry = snd_info_create_module_entry(THIS_MODULE, "devices", NULL); 393 entry = snd_info_create_module_entry(THIS_MODULE, "devices", NULL);
394 if (entry) { 394 if (entry) {
395 entry->c.text.read_size = PAGE_SIZE;
396 entry->c.text.read = snd_minor_info_read; 395 entry->c.text.read = snd_minor_info_read;
397 if (snd_info_register(entry) < 0) { 396 if (snd_info_register(entry) < 0) {
398 snd_info_free_entry(entry); 397 snd_info_free_entry(entry);
diff --git a/sound/core/sound_oss.c b/sound/core/sound_oss.c
index c18f6a45e4d9..0043c9a97de6 100644
--- a/sound/core/sound_oss.c
+++ b/sound/core/sound_oss.c
@@ -258,7 +258,6 @@ int __init snd_minor_info_oss_init(void)
258 258
259 entry = snd_info_create_module_entry(THIS_MODULE, "devices", snd_oss_root); 259 entry = snd_info_create_module_entry(THIS_MODULE, "devices", snd_oss_root);
260 if (entry) { 260 if (entry) {
261 entry->c.text.read_size = PAGE_SIZE;
262 entry->c.text.read = snd_minor_info_oss_read; 261 entry->c.text.read = snd_minor_info_oss_read;
263 if (snd_info_register(entry) < 0) { 262 if (snd_info_register(entry) < 0) {
264 snd_info_free_entry(entry); 263 snd_info_free_entry(entry);
diff --git a/sound/core/timer.c b/sound/core/timer.c
index cdeeb639b675..9a1e51c7c230 100644
--- a/sound/core/timer.c
+++ b/sound/core/timer.c
@@ -1117,7 +1117,6 @@ static void __init snd_timer_proc_init(void)
1117 1117
1118 entry = snd_info_create_module_entry(THIS_MODULE, "timers", NULL); 1118 entry = snd_info_create_module_entry(THIS_MODULE, "timers", NULL);
1119 if (entry != NULL) { 1119 if (entry != NULL) {
1120 entry->c.text.read_size = SNDRV_TIMER_DEVICES * 128;
1121 entry->c.text.read = snd_timer_proc_read; 1120 entry->c.text.read = snd_timer_proc_read;
1122 if (snd_info_register(entry) < 0) { 1121 if (snd_info_register(entry) < 0) {
1123 snd_info_free_entry(entry); 1122 snd_info_free_entry(entry);
diff --git a/sound/drivers/vx/vx_core.c b/sound/drivers/vx/vx_core.c
index e1c3dda15774..a60168268ddd 100644
--- a/sound/drivers/vx/vx_core.c
+++ b/sound/drivers/vx/vx_core.c
@@ -640,7 +640,7 @@ static void vx_proc_init(struct vx_core *chip)
640 struct snd_info_entry *entry; 640 struct snd_info_entry *entry;
641 641
642 if (! snd_card_proc_new(chip->card, "vx-status", &entry)) 642 if (! snd_card_proc_new(chip->card, "vx-status", &entry))
643 snd_info_set_text_ops(entry, chip, 1024, vx_proc_read); 643 snd_info_set_text_ops(entry, chip, vx_proc_read);
644} 644}
645 645
646 646
diff --git a/sound/i2c/l3/uda1341.c b/sound/i2c/l3/uda1341.c
index 746500e06950..b074fdddea55 100644
--- a/sound/i2c/l3/uda1341.c
+++ b/sound/i2c/l3/uda1341.c
@@ -517,9 +517,9 @@ static void __devinit snd_uda1341_proc_init(struct snd_card *card, struct l3_cli
517 struct snd_info_entry *entry; 517 struct snd_info_entry *entry;
518 518
519 if (! snd_card_proc_new(card, "uda1341", &entry)) 519 if (! snd_card_proc_new(card, "uda1341", &entry))
520 snd_info_set_text_ops(entry, clnt, 1024, snd_uda1341_proc_read); 520 snd_info_set_text_ops(entry, clnt, snd_uda1341_proc_read);
521 if (! snd_card_proc_new(card, "uda1341-regs", &entry)) 521 if (! snd_card_proc_new(card, "uda1341-regs", &entry))
522 snd_info_set_text_ops(entry, clnt, 1024, snd_uda1341_proc_regs_read); 522 snd_info_set_text_ops(entry, clnt, snd_uda1341_proc_regs_read);
523} 523}
524 524
525/* }}} */ 525/* }}} */
diff --git a/sound/isa/gus/gus_irq.c b/sound/isa/gus/gus_irq.c
index c19ba2910b72..42db37552efb 100644
--- a/sound/isa/gus/gus_irq.c
+++ b/sound/isa/gus/gus_irq.c
@@ -136,7 +136,7 @@ void snd_gus_irq_profile_init(struct snd_gus_card *gus)
136 struct snd_info_entry *entry; 136 struct snd_info_entry *entry;
137 137
138 if (! snd_card_proc_new(gus->card, "gusirq", &entry)) 138 if (! snd_card_proc_new(gus->card, "gusirq", &entry))
139 snd_info_set_text_ops(entry, gus, 1024, snd_gus_irq_info_read); 139 snd_info_set_text_ops(entry, gus, snd_gus_irq_info_read);
140} 140}
141 141
142#endif 142#endif
diff --git a/sound/isa/gus/gus_mem.c b/sound/isa/gus/gus_mem.c
index 3c0d27aa08b3..f50c276caee8 100644
--- a/sound/isa/gus/gus_mem.c
+++ b/sound/isa/gus/gus_mem.c
@@ -264,10 +264,8 @@ int snd_gf1_mem_init(struct snd_gus_card * gus)
264 if (snd_gf1_mem_xalloc(alloc, &block) == NULL) 264 if (snd_gf1_mem_xalloc(alloc, &block) == NULL)
265 return -ENOMEM; 265 return -ENOMEM;
266#ifdef CONFIG_SND_DEBUG 266#ifdef CONFIG_SND_DEBUG
267 if (! snd_card_proc_new(gus->card, "gusmem", &entry)) { 267 if (! snd_card_proc_new(gus->card, "gusmem", &entry))
268 snd_info_set_text_ops(entry, gus, 1024, snd_gf1_mem_info_read); 268 snd_info_set_text_ops(entry, gus, snd_gf1_mem_info_read);
269 entry->c.text.read_size = 256 * 1024;
270 }
271#endif 269#endif
272 return 0; 270 return 0;
273} 271}
diff --git a/sound/isa/opti9xx/miro.c b/sound/isa/opti9xx/miro.c
index e6bfcf74c1c1..283817f2de75 100644
--- a/sound/isa/opti9xx/miro.c
+++ b/sound/isa/opti9xx/miro.c
@@ -967,7 +967,7 @@ static void __init snd_miro_proc_init(struct snd_miro * miro)
967 struct snd_info_entry *entry; 967 struct snd_info_entry *entry;
968 968
969 if (! snd_card_proc_new(miro->card, "miro", &entry)) 969 if (! snd_card_proc_new(miro->card, "miro", &entry))
970 snd_info_set_text_ops(entry, miro, 1024, snd_miro_proc_read); 970 snd_info_set_text_ops(entry, miro, snd_miro_proc_read);
971} 971}
972 972
973/* 973/*
diff --git a/sound/isa/sb/sb16_csp.c b/sound/isa/sb/sb16_csp.c
index 9703c68e4e08..fcd638090a9e 100644
--- a/sound/isa/sb/sb16_csp.c
+++ b/sound/isa/sb/sb16_csp.c
@@ -1101,7 +1101,7 @@ static int init_proc_entry(struct snd_sb_csp * p, int device)
1101 struct snd_info_entry *entry; 1101 struct snd_info_entry *entry;
1102 sprintf(name, "cspD%d", device); 1102 sprintf(name, "cspD%d", device);
1103 if (! snd_card_proc_new(p->chip->card, name, &entry)) 1103 if (! snd_card_proc_new(p->chip->card, name, &entry))
1104 snd_info_set_text_ops(entry, p, 1024, info_read); 1104 snd_info_set_text_ops(entry, p, info_read);
1105 return 0; 1105 return 0;
1106} 1106}
1107 1107
diff --git a/sound/pci/ac97/ac97_proc.c b/sound/pci/ac97/ac97_proc.c
index 4d523df79cc7..2118df50b9d6 100644
--- a/sound/pci/ac97/ac97_proc.c
+++ b/sound/pci/ac97/ac97_proc.c
@@ -433,7 +433,7 @@ void snd_ac97_proc_init(struct snd_ac97 * ac97)
433 prefix = ac97_is_audio(ac97) ? "ac97" : "mc97"; 433 prefix = ac97_is_audio(ac97) ? "ac97" : "mc97";
434 sprintf(name, "%s#%d-%d", prefix, ac97->addr, ac97->num); 434 sprintf(name, "%s#%d-%d", prefix, ac97->addr, ac97->num);
435 if ((entry = snd_info_create_card_entry(ac97->bus->card, name, ac97->bus->proc)) != NULL) { 435 if ((entry = snd_info_create_card_entry(ac97->bus->card, name, ac97->bus->proc)) != NULL) {
436 snd_info_set_text_ops(entry, ac97, 1024, snd_ac97_proc_read); 436 snd_info_set_text_ops(entry, ac97, snd_ac97_proc_read);
437 if (snd_info_register(entry) < 0) { 437 if (snd_info_register(entry) < 0) {
438 snd_info_free_entry(entry); 438 snd_info_free_entry(entry);
439 entry = NULL; 439 entry = NULL;
@@ -442,10 +442,9 @@ void snd_ac97_proc_init(struct snd_ac97 * ac97)
442 ac97->proc = entry; 442 ac97->proc = entry;
443 sprintf(name, "%s#%d-%d+regs", prefix, ac97->addr, ac97->num); 443 sprintf(name, "%s#%d-%d+regs", prefix, ac97->addr, ac97->num);
444 if ((entry = snd_info_create_card_entry(ac97->bus->card, name, ac97->bus->proc)) != NULL) { 444 if ((entry = snd_info_create_card_entry(ac97->bus->card, name, ac97->bus->proc)) != NULL) {
445 snd_info_set_text_ops(entry, ac97, 1024, snd_ac97_proc_regs_read); 445 snd_info_set_text_ops(entry, ac97, snd_ac97_proc_regs_read);
446#ifdef CONFIG_SND_DEBUG 446#ifdef CONFIG_SND_DEBUG
447 entry->mode |= S_IWUSR; 447 entry->mode |= S_IWUSR;
448 entry->c.text.write_size = 1024;
449 entry->c.text.write = snd_ac97_proc_regs_write; 448 entry->c.text.write = snd_ac97_proc_regs_write;
450#endif 449#endif
451 if (snd_info_register(entry) < 0) { 450 if (snd_info_register(entry) < 0) {
diff --git a/sound/pci/ac97/ak4531_codec.c b/sound/pci/ac97/ak4531_codec.c
index 0fb7b3407312..94c26ec05882 100644
--- a/sound/pci/ac97/ak4531_codec.c
+++ b/sound/pci/ac97/ak4531_codec.c
@@ -453,7 +453,7 @@ static void snd_ak4531_proc_init(struct snd_card *card, struct snd_ak4531 *ak453
453 struct snd_info_entry *entry; 453 struct snd_info_entry *entry;
454 454
455 if (! snd_card_proc_new(card, "ak4531", &entry)) 455 if (! snd_card_proc_new(card, "ak4531", &entry))
456 snd_info_set_text_ops(entry, ak4531, 1024, snd_ak4531_proc_read); 456 snd_info_set_text_ops(entry, ak4531, snd_ak4531_proc_read);
457} 457}
458#endif 458#endif
459 459
diff --git a/sound/pci/ad1889.c b/sound/pci/ad1889.c
index eece1c7e55a0..d42bf4570367 100644
--- a/sound/pci/ad1889.c
+++ b/sound/pci/ad1889.c
@@ -753,7 +753,7 @@ snd_ad1889_proc_init(struct snd_ad1889 *chip)
753 struct snd_info_entry *entry; 753 struct snd_info_entry *entry;
754 754
755 if (!snd_card_proc_new(chip->card, chip->card->driver, &entry)) 755 if (!snd_card_proc_new(chip->card, chip->card->driver, &entry))
756 snd_info_set_text_ops(entry, chip, 1024, snd_ad1889_proc_read); 756 snd_info_set_text_ops(entry, chip, snd_ad1889_proc_read);
757} 757}
758 758
759static struct ac97_quirk ac97_quirks[] = { 759static struct ac97_quirk ac97_quirks[] = {
diff --git a/sound/pci/ali5451/ali5451.c b/sound/pci/ali5451/ali5451.c
index e2dbc2118902..4f01ef10fac2 100644
--- a/sound/pci/ali5451/ali5451.c
+++ b/sound/pci/ali5451/ali5451.c
@@ -2173,7 +2173,7 @@ static void __devinit snd_ali_proc_init(struct snd_ali *codec)
2173{ 2173{
2174 struct snd_info_entry *entry; 2174 struct snd_info_entry *entry;
2175 if(!snd_card_proc_new(codec->card, "ali5451", &entry)) 2175 if(!snd_card_proc_new(codec->card, "ali5451", &entry))
2176 snd_info_set_text_ops(entry, codec, 1024, snd_ali_proc_read); 2176 snd_info_set_text_ops(entry, codec, snd_ali_proc_read);
2177} 2177}
2178 2178
2179static int __devinit snd_ali_resources(struct snd_ali *codec) 2179static int __devinit snd_ali_resources(struct snd_ali *codec)
diff --git a/sound/pci/atiixp.c b/sound/pci/atiixp.c
index d0f759d86d3d..f18a8c0e4688 100644
--- a/sound/pci/atiixp.c
+++ b/sound/pci/atiixp.c
@@ -1504,7 +1504,7 @@ static void __devinit snd_atiixp_proc_init(struct atiixp *chip)
1504 struct snd_info_entry *entry; 1504 struct snd_info_entry *entry;
1505 1505
1506 if (! snd_card_proc_new(chip->card, "atiixp", &entry)) 1506 if (! snd_card_proc_new(chip->card, "atiixp", &entry))
1507 snd_info_set_text_ops(entry, chip, 1024, snd_atiixp_proc_read); 1507 snd_info_set_text_ops(entry, chip, snd_atiixp_proc_read);
1508} 1508}
1509#else /* !CONFIG_PROC_FS */ 1509#else /* !CONFIG_PROC_FS */
1510#define snd_atiixp_proc_init(chip) 1510#define snd_atiixp_proc_init(chip)
diff --git a/sound/pci/atiixp_modem.c b/sound/pci/atiixp_modem.c
index 12a34c39caa7..40739057076b 100644
--- a/sound/pci/atiixp_modem.c
+++ b/sound/pci/atiixp_modem.c
@@ -1177,7 +1177,7 @@ static void __devinit snd_atiixp_proc_init(struct atiixp_modem *chip)
1177 struct snd_info_entry *entry; 1177 struct snd_info_entry *entry;
1178 1178
1179 if (! snd_card_proc_new(chip->card, "atiixp-modem", &entry)) 1179 if (! snd_card_proc_new(chip->card, "atiixp-modem", &entry))
1180 snd_info_set_text_ops(entry, chip, 1024, snd_atiixp_proc_read); 1180 snd_info_set_text_ops(entry, chip, snd_atiixp_proc_read);
1181} 1181}
1182#else 1182#else
1183#define snd_atiixp_proc_init(chip) 1183#define snd_atiixp_proc_init(chip)
diff --git a/sound/pci/ca0106/ca0106_proc.c b/sound/pci/ca0106/ca0106_proc.c
index 63757273bfb7..75ca421eb3a1 100644
--- a/sound/pci/ca0106/ca0106_proc.c
+++ b/sound/pci/ca0106/ca0106_proc.c
@@ -431,33 +431,30 @@ int __devinit snd_ca0106_proc_init(struct snd_ca0106 * emu)
431 struct snd_info_entry *entry; 431 struct snd_info_entry *entry;
432 432
433 if(! snd_card_proc_new(emu->card, "iec958", &entry)) 433 if(! snd_card_proc_new(emu->card, "iec958", &entry))
434 snd_info_set_text_ops(entry, emu, 1024, snd_ca0106_proc_iec958); 434 snd_info_set_text_ops(entry, emu, snd_ca0106_proc_iec958);
435 if(! snd_card_proc_new(emu->card, "ca0106_reg32", &entry)) { 435 if(! snd_card_proc_new(emu->card, "ca0106_reg32", &entry)) {
436 snd_info_set_text_ops(entry, emu, 1024, snd_ca0106_proc_reg_read32); 436 snd_info_set_text_ops(entry, emu, snd_ca0106_proc_reg_read32);
437 entry->c.text.write_size = 64;
438 entry->c.text.write = snd_ca0106_proc_reg_write32; 437 entry->c.text.write = snd_ca0106_proc_reg_write32;
439 entry->mode |= S_IWUSR; 438 entry->mode |= S_IWUSR;
440 } 439 }
441 if(! snd_card_proc_new(emu->card, "ca0106_reg16", &entry)) 440 if(! snd_card_proc_new(emu->card, "ca0106_reg16", &entry))
442 snd_info_set_text_ops(entry, emu, 1024, snd_ca0106_proc_reg_read16); 441 snd_info_set_text_ops(entry, emu, snd_ca0106_proc_reg_read16);
443 if(! snd_card_proc_new(emu->card, "ca0106_reg8", &entry)) 442 if(! snd_card_proc_new(emu->card, "ca0106_reg8", &entry))
444 snd_info_set_text_ops(entry, emu, 1024, snd_ca0106_proc_reg_read8); 443 snd_info_set_text_ops(entry, emu, snd_ca0106_proc_reg_read8);
445 if(! snd_card_proc_new(emu->card, "ca0106_regs1", &entry)) { 444 if(! snd_card_proc_new(emu->card, "ca0106_regs1", &entry)) {
446 snd_info_set_text_ops(entry, emu, 1024, snd_ca0106_proc_reg_read1); 445 snd_info_set_text_ops(entry, emu, snd_ca0106_proc_reg_read1);
447 entry->c.text.write_size = 64;
448 entry->c.text.write = snd_ca0106_proc_reg_write; 446 entry->c.text.write = snd_ca0106_proc_reg_write;
449 entry->mode |= S_IWUSR; 447 entry->mode |= S_IWUSR;
450// entry->private_data = emu; 448// entry->private_data = emu;
451 } 449 }
452 if(! snd_card_proc_new(emu->card, "ca0106_i2c", &entry)) { 450 if(! snd_card_proc_new(emu->card, "ca0106_i2c", &entry)) {
453 snd_info_set_text_ops(entry, emu, 1024, snd_ca0106_proc_i2c_write); 451 snd_info_set_text_ops(entry, emu, snd_ca0106_proc_i2c_write);
454 entry->c.text.write_size = 64;
455 entry->c.text.write = snd_ca0106_proc_i2c_write; 452 entry->c.text.write = snd_ca0106_proc_i2c_write;
456 entry->mode |= S_IWUSR; 453 entry->mode |= S_IWUSR;
457// entry->private_data = emu; 454// entry->private_data = emu;
458 } 455 }
459 if(! snd_card_proc_new(emu->card, "ca0106_regs2", &entry)) 456 if(! snd_card_proc_new(emu->card, "ca0106_regs2", &entry))
460 snd_info_set_text_ops(entry, emu, 1024, snd_ca0106_proc_reg_read2); 457 snd_info_set_text_ops(entry, emu, snd_ca0106_proc_reg_read2);
461 return 0; 458 return 0;
462} 459}
463 460
diff --git a/sound/pci/cmipci.c b/sound/pci/cmipci.c
index e5ce2dabd081..42ca92be18f9 100644
--- a/sound/pci/cmipci.c
+++ b/sound/pci/cmipci.c
@@ -2602,7 +2602,7 @@ static void __devinit snd_cmipci_proc_init(struct cmipci *cm)
2602 struct snd_info_entry *entry; 2602 struct snd_info_entry *entry;
2603 2603
2604 if (! snd_card_proc_new(cm->card, "cmipci", &entry)) 2604 if (! snd_card_proc_new(cm->card, "cmipci", &entry))
2605 snd_info_set_text_ops(entry, cm, 1024, snd_cmipci_proc_read); 2605 snd_info_set_text_ops(entry, cm, snd_cmipci_proc_read);
2606} 2606}
2607#else /* !CONFIG_PROC_FS */ 2607#else /* !CONFIG_PROC_FS */
2608static inline void snd_cmipci_proc_init(struct cmipci *cm) {} 2608static inline void snd_cmipci_proc_init(struct cmipci *cm) {}
diff --git a/sound/pci/cs4281.c b/sound/pci/cs4281.c
index b3c94d83450a..8c150eab45b6 100644
--- a/sound/pci/cs4281.c
+++ b/sound/pci/cs4281.c
@@ -1184,7 +1184,7 @@ static void __devinit snd_cs4281_proc_init(struct cs4281 * chip)
1184 struct snd_info_entry *entry; 1184 struct snd_info_entry *entry;
1185 1185
1186 if (! snd_card_proc_new(chip->card, "cs4281", &entry)) 1186 if (! snd_card_proc_new(chip->card, "cs4281", &entry))
1187 snd_info_set_text_ops(entry, chip, 1024, snd_cs4281_proc_read); 1187 snd_info_set_text_ops(entry, chip, snd_cs4281_proc_read);
1188 if (! snd_card_proc_new(chip->card, "cs4281_BA0", &entry)) { 1188 if (! snd_card_proc_new(chip->card, "cs4281_BA0", &entry)) {
1189 entry->content = SNDRV_INFO_CONTENT_DATA; 1189 entry->content = SNDRV_INFO_CONTENT_DATA;
1190 entry->private_data = chip; 1190 entry->private_data = chip;
diff --git a/sound/pci/cs46xx/dsp_spos.c b/sound/pci/cs46xx/dsp_spos.c
index f407d2a5ce3b..5c9711c0265c 100644
--- a/sound/pci/cs46xx/dsp_spos.c
+++ b/sound/pci/cs46xx/dsp_spos.c
@@ -767,7 +767,6 @@ int cs46xx_dsp_proc_init (struct snd_card *card, struct snd_cs46xx *chip)
767 if ((entry = snd_info_create_card_entry(card, "dsp", card->proc_root)) != NULL) { 767 if ((entry = snd_info_create_card_entry(card, "dsp", card->proc_root)) != NULL) {
768 entry->content = SNDRV_INFO_CONTENT_TEXT; 768 entry->content = SNDRV_INFO_CONTENT_TEXT;
769 entry->mode = S_IFDIR | S_IRUGO | S_IXUGO; 769 entry->mode = S_IFDIR | S_IRUGO | S_IXUGO;
770 entry->c.text.read_size = 512;
771 770
772 if (snd_info_register(entry) < 0) { 771 if (snd_info_register(entry) < 0) {
773 snd_info_free_entry(entry); 772 snd_info_free_entry(entry);
@@ -784,7 +783,6 @@ int cs46xx_dsp_proc_init (struct snd_card *card, struct snd_cs46xx *chip)
784 entry->content = SNDRV_INFO_CONTENT_TEXT; 783 entry->content = SNDRV_INFO_CONTENT_TEXT;
785 entry->private_data = chip; 784 entry->private_data = chip;
786 entry->mode = S_IFREG | S_IRUGO | S_IWUSR; 785 entry->mode = S_IFREG | S_IRUGO | S_IWUSR;
787 entry->c.text.read_size = 512;
788 entry->c.text.read = cs46xx_dsp_proc_symbol_table_read; 786 entry->c.text.read = cs46xx_dsp_proc_symbol_table_read;
789 if (snd_info_register(entry) < 0) { 787 if (snd_info_register(entry) < 0) {
790 snd_info_free_entry(entry); 788 snd_info_free_entry(entry);
@@ -797,7 +795,6 @@ int cs46xx_dsp_proc_init (struct snd_card *card, struct snd_cs46xx *chip)
797 entry->content = SNDRV_INFO_CONTENT_TEXT; 795 entry->content = SNDRV_INFO_CONTENT_TEXT;
798 entry->private_data = chip; 796 entry->private_data = chip;
799 entry->mode = S_IFREG | S_IRUGO | S_IWUSR; 797 entry->mode = S_IFREG | S_IRUGO | S_IWUSR;
800 entry->c.text.read_size = 512;
801 entry->c.text.read = cs46xx_dsp_proc_modules_read; 798 entry->c.text.read = cs46xx_dsp_proc_modules_read;
802 if (snd_info_register(entry) < 0) { 799 if (snd_info_register(entry) < 0) {
803 snd_info_free_entry(entry); 800 snd_info_free_entry(entry);
@@ -810,7 +807,6 @@ int cs46xx_dsp_proc_init (struct snd_card *card, struct snd_cs46xx *chip)
810 entry->content = SNDRV_INFO_CONTENT_TEXT; 807 entry->content = SNDRV_INFO_CONTENT_TEXT;
811 entry->private_data = chip; 808 entry->private_data = chip;
812 entry->mode = S_IFREG | S_IRUGO | S_IWUSR; 809 entry->mode = S_IFREG | S_IRUGO | S_IWUSR;
813 entry->c.text.read_size = 512;
814 entry->c.text.read = cs46xx_dsp_proc_parameter_dump_read; 810 entry->c.text.read = cs46xx_dsp_proc_parameter_dump_read;
815 if (snd_info_register(entry) < 0) { 811 if (snd_info_register(entry) < 0) {
816 snd_info_free_entry(entry); 812 snd_info_free_entry(entry);
@@ -823,7 +819,6 @@ int cs46xx_dsp_proc_init (struct snd_card *card, struct snd_cs46xx *chip)
823 entry->content = SNDRV_INFO_CONTENT_TEXT; 819 entry->content = SNDRV_INFO_CONTENT_TEXT;
824 entry->private_data = chip; 820 entry->private_data = chip;
825 entry->mode = S_IFREG | S_IRUGO | S_IWUSR; 821 entry->mode = S_IFREG | S_IRUGO | S_IWUSR;
826 entry->c.text.read_size = 512;
827 entry->c.text.read = cs46xx_dsp_proc_sample_dump_read; 822 entry->c.text.read = cs46xx_dsp_proc_sample_dump_read;
828 if (snd_info_register(entry) < 0) { 823 if (snd_info_register(entry) < 0) {
829 snd_info_free_entry(entry); 824 snd_info_free_entry(entry);
@@ -836,7 +831,6 @@ int cs46xx_dsp_proc_init (struct snd_card *card, struct snd_cs46xx *chip)
836 entry->content = SNDRV_INFO_CONTENT_TEXT; 831 entry->content = SNDRV_INFO_CONTENT_TEXT;
837 entry->private_data = chip; 832 entry->private_data = chip;
838 entry->mode = S_IFREG | S_IRUGO | S_IWUSR; 833 entry->mode = S_IFREG | S_IRUGO | S_IWUSR;
839 entry->c.text.read_size = 512;
840 entry->c.text.read = cs46xx_dsp_proc_task_tree_read; 834 entry->c.text.read = cs46xx_dsp_proc_task_tree_read;
841 if (snd_info_register(entry) < 0) { 835 if (snd_info_register(entry) < 0) {
842 snd_info_free_entry(entry); 836 snd_info_free_entry(entry);
@@ -849,7 +843,6 @@ int cs46xx_dsp_proc_init (struct snd_card *card, struct snd_cs46xx *chip)
849 entry->content = SNDRV_INFO_CONTENT_TEXT; 843 entry->content = SNDRV_INFO_CONTENT_TEXT;
850 entry->private_data = chip; 844 entry->private_data = chip;
851 entry->mode = S_IFREG | S_IRUGO | S_IWUSR; 845 entry->mode = S_IFREG | S_IRUGO | S_IWUSR;
852 entry->c.text.read_size = 1024;
853 entry->c.text.read = cs46xx_dsp_proc_scb_read; 846 entry->c.text.read = cs46xx_dsp_proc_scb_read;
854 if (snd_info_register(entry) < 0) { 847 if (snd_info_register(entry) < 0) {
855 snd_info_free_entry(entry); 848 snd_info_free_entry(entry);
diff --git a/sound/pci/cs46xx/dsp_spos_scb_lib.c b/sound/pci/cs46xx/dsp_spos_scb_lib.c
index 2c4ee45fe10c..3844d18af19c 100644
--- a/sound/pci/cs46xx/dsp_spos_scb_lib.c
+++ b/sound/pci/cs46xx/dsp_spos_scb_lib.c
@@ -267,7 +267,6 @@ void cs46xx_dsp_proc_register_scb_desc (struct snd_cs46xx *chip,
267 entry->private_data = scb_info; 267 entry->private_data = scb_info;
268 entry->mode = S_IFREG | S_IRUGO | S_IWUSR; 268 entry->mode = S_IFREG | S_IRUGO | S_IWUSR;
269 269
270 entry->c.text.read_size = 512;
271 entry->c.text.read = cs46xx_dsp_proc_scb_info_read; 270 entry->c.text.read = cs46xx_dsp_proc_scb_info_read;
272 271
273 if (snd_info_register(entry) < 0) { 272 if (snd_info_register(entry) < 0) {
diff --git a/sound/pci/emu10k1/emu10k1x.c b/sound/pci/emu10k1/emu10k1x.c
index d51290c18167..0fb27e4be07b 100644
--- a/sound/pci/emu10k1/emu10k1x.c
+++ b/sound/pci/emu10k1/emu10k1x.c
@@ -1055,8 +1055,7 @@ static int __devinit snd_emu10k1x_proc_init(struct emu10k1x * emu)
1055 struct snd_info_entry *entry; 1055 struct snd_info_entry *entry;
1056 1056
1057 if(! snd_card_proc_new(emu->card, "emu10k1x_regs", &entry)) { 1057 if(! snd_card_proc_new(emu->card, "emu10k1x_regs", &entry)) {
1058 snd_info_set_text_ops(entry, emu, 1024, snd_emu10k1x_proc_reg_read); 1058 snd_info_set_text_ops(entry, emu, snd_emu10k1x_proc_reg_read);
1059 entry->c.text.write_size = 64;
1060 entry->c.text.write = snd_emu10k1x_proc_reg_write; 1059 entry->c.text.write = snd_emu10k1x_proc_reg_write;
1061 entry->mode |= S_IWUSR; 1060 entry->mode |= S_IWUSR;
1062 entry->private_data = emu; 1061 entry->private_data = emu;
diff --git a/sound/pci/emu10k1/emuproc.c b/sound/pci/emu10k1/emuproc.c
index 90f1c52703a1..b939e03aaedf 100644
--- a/sound/pci/emu10k1/emuproc.c
+++ b/sound/pci/emu10k1/emuproc.c
@@ -532,57 +532,51 @@ int __devinit snd_emu10k1_proc_init(struct snd_emu10k1 * emu)
532 struct snd_info_entry *entry; 532 struct snd_info_entry *entry;
533#ifdef CONFIG_SND_DEBUG 533#ifdef CONFIG_SND_DEBUG
534 if (! snd_card_proc_new(emu->card, "io_regs", &entry)) { 534 if (! snd_card_proc_new(emu->card, "io_regs", &entry)) {
535 snd_info_set_text_ops(entry, emu, 1024, snd_emu_proc_io_reg_read); 535 snd_info_set_text_ops(entry, emu, snd_emu_proc_io_reg_read);
536 entry->c.text.write_size = 64;
537 entry->c.text.write = snd_emu_proc_io_reg_write; 536 entry->c.text.write = snd_emu_proc_io_reg_write;
538 entry->mode |= S_IWUSR; 537 entry->mode |= S_IWUSR;
539 } 538 }
540 if (! snd_card_proc_new(emu->card, "ptr_regs00a", &entry)) { 539 if (! snd_card_proc_new(emu->card, "ptr_regs00a", &entry)) {
541 snd_info_set_text_ops(entry, emu, 65536, snd_emu_proc_ptr_reg_read00a); 540 snd_info_set_text_ops(entry, emu, snd_emu_proc_ptr_reg_read00a);
542 entry->c.text.write_size = 64;
543 entry->c.text.write = snd_emu_proc_ptr_reg_write00; 541 entry->c.text.write = snd_emu_proc_ptr_reg_write00;
544 entry->mode |= S_IWUSR; 542 entry->mode |= S_IWUSR;
545 } 543 }
546 if (! snd_card_proc_new(emu->card, "ptr_regs00b", &entry)) { 544 if (! snd_card_proc_new(emu->card, "ptr_regs00b", &entry)) {
547 snd_info_set_text_ops(entry, emu, 65536, snd_emu_proc_ptr_reg_read00b); 545 snd_info_set_text_ops(entry, emu, snd_emu_proc_ptr_reg_read00b);
548 entry->c.text.write_size = 64;
549 entry->c.text.write = snd_emu_proc_ptr_reg_write00; 546 entry->c.text.write = snd_emu_proc_ptr_reg_write00;
550 entry->mode |= S_IWUSR; 547 entry->mode |= S_IWUSR;
551 } 548 }
552 if (! snd_card_proc_new(emu->card, "ptr_regs20a", &entry)) { 549 if (! snd_card_proc_new(emu->card, "ptr_regs20a", &entry)) {
553 snd_info_set_text_ops(entry, emu, 65536, snd_emu_proc_ptr_reg_read20a); 550 snd_info_set_text_ops(entry, emu, snd_emu_proc_ptr_reg_read20a);
554 entry->c.text.write_size = 64;
555 entry->c.text.write = snd_emu_proc_ptr_reg_write20; 551 entry->c.text.write = snd_emu_proc_ptr_reg_write20;
556 entry->mode |= S_IWUSR; 552 entry->mode |= S_IWUSR;
557 } 553 }
558 if (! snd_card_proc_new(emu->card, "ptr_regs20b", &entry)) { 554 if (! snd_card_proc_new(emu->card, "ptr_regs20b", &entry)) {
559 snd_info_set_text_ops(entry, emu, 65536, snd_emu_proc_ptr_reg_read20b); 555 snd_info_set_text_ops(entry, emu, snd_emu_proc_ptr_reg_read20b);
560 entry->c.text.write_size = 64;
561 entry->c.text.write = snd_emu_proc_ptr_reg_write20; 556 entry->c.text.write = snd_emu_proc_ptr_reg_write20;
562 entry->mode |= S_IWUSR; 557 entry->mode |= S_IWUSR;
563 } 558 }
564 if (! snd_card_proc_new(emu->card, "ptr_regs20c", &entry)) { 559 if (! snd_card_proc_new(emu->card, "ptr_regs20c", &entry)) {
565 snd_info_set_text_ops(entry, emu, 65536, snd_emu_proc_ptr_reg_read20c); 560 snd_info_set_text_ops(entry, emu, snd_emu_proc_ptr_reg_read20c);
566 entry->c.text.write_size = 64;
567 entry->c.text.write = snd_emu_proc_ptr_reg_write20; 561 entry->c.text.write = snd_emu_proc_ptr_reg_write20;
568 entry->mode |= S_IWUSR; 562 entry->mode |= S_IWUSR;
569 } 563 }
570#endif 564#endif
571 565
572 if (! snd_card_proc_new(emu->card, "emu10k1", &entry)) 566 if (! snd_card_proc_new(emu->card, "emu10k1", &entry))
573 snd_info_set_text_ops(entry, emu, 2048, snd_emu10k1_proc_read); 567 snd_info_set_text_ops(entry, emu, snd_emu10k1_proc_read);
574 568
575 if (emu->card_capabilities->emu10k2_chip) { 569 if (emu->card_capabilities->emu10k2_chip) {
576 if (! snd_card_proc_new(emu->card, "spdif-in", &entry)) 570 if (! snd_card_proc_new(emu->card, "spdif-in", &entry))
577 snd_info_set_text_ops(entry, emu, 2048, snd_emu10k1_proc_spdif_read); 571 snd_info_set_text_ops(entry, emu, snd_emu10k1_proc_spdif_read);
578 } 572 }
579 if (emu->card_capabilities->ca0151_chip) { 573 if (emu->card_capabilities->ca0151_chip) {
580 if (! snd_card_proc_new(emu->card, "capture-rates", &entry)) 574 if (! snd_card_proc_new(emu->card, "capture-rates", &entry))
581 snd_info_set_text_ops(entry, emu, 2048, snd_emu10k1_proc_rates_read); 575 snd_info_set_text_ops(entry, emu, snd_emu10k1_proc_rates_read);
582 } 576 }
583 577
584 if (! snd_card_proc_new(emu->card, "voices", &entry)) 578 if (! snd_card_proc_new(emu->card, "voices", &entry))
585 snd_info_set_text_ops(entry, emu, 2048, snd_emu10k1_proc_voices_read); 579 snd_info_set_text_ops(entry, emu, snd_emu10k1_proc_voices_read);
586 580
587 if (! snd_card_proc_new(emu->card, "fx8010_gpr", &entry)) { 581 if (! snd_card_proc_new(emu->card, "fx8010_gpr", &entry)) {
588 entry->content = SNDRV_INFO_CONTENT_DATA; 582 entry->content = SNDRV_INFO_CONTENT_DATA;
@@ -616,7 +610,6 @@ int __devinit snd_emu10k1_proc_init(struct snd_emu10k1 * emu)
616 entry->content = SNDRV_INFO_CONTENT_TEXT; 610 entry->content = SNDRV_INFO_CONTENT_TEXT;
617 entry->private_data = emu; 611 entry->private_data = emu;
618 entry->mode = S_IFREG | S_IRUGO /*| S_IWUSR*/; 612 entry->mode = S_IFREG | S_IRUGO /*| S_IWUSR*/;
619 entry->c.text.read_size = 128*1024;
620 entry->c.text.read = snd_emu10k1_proc_acode_read; 613 entry->c.text.read = snd_emu10k1_proc_acode_read;
621 } 614 }
622 return 0; 615 return 0;
diff --git a/sound/pci/ens1370.c b/sound/pci/ens1370.c
index ca9e34e88f62..9d46bbee2a40 100644
--- a/sound/pci/ens1370.c
+++ b/sound/pci/ens1370.c
@@ -1915,7 +1915,7 @@ static void __devinit snd_ensoniq_proc_init(struct ensoniq * ensoniq)
1915 struct snd_info_entry *entry; 1915 struct snd_info_entry *entry;
1916 1916
1917 if (! snd_card_proc_new(ensoniq->card, "audiopci", &entry)) 1917 if (! snd_card_proc_new(ensoniq->card, "audiopci", &entry))
1918 snd_info_set_text_ops(entry, ensoniq, 1024, snd_ensoniq_proc_read); 1918 snd_info_set_text_ops(entry, ensoniq, snd_ensoniq_proc_read);
1919} 1919}
1920 1920
1921/* 1921/*
diff --git a/sound/pci/hda/hda_proc.c b/sound/pci/hda/hda_proc.c
index ca514a6a5875..3db009990c5f 100644
--- a/sound/pci/hda/hda_proc.c
+++ b/sound/pci/hda/hda_proc.c
@@ -318,7 +318,7 @@ int snd_hda_codec_proc_new(struct hda_codec *codec)
318 if (err < 0) 318 if (err < 0)
319 return err; 319 return err;
320 320
321 snd_info_set_text_ops(entry, codec, 32 * 1024, print_codec_info); 321 snd_info_set_text_ops(entry, codec, print_codec_info);
322 return 0; 322 return 0;
323} 323}
324 324
diff --git a/sound/pci/ice1712/ice1712.c b/sound/pci/ice1712/ice1712.c
index 2821014b26e9..52de85e21b95 100644
--- a/sound/pci/ice1712/ice1712.c
+++ b/sound/pci/ice1712/ice1712.c
@@ -1596,7 +1596,7 @@ static void __devinit snd_ice1712_proc_init(struct snd_ice1712 * ice)
1596 struct snd_info_entry *entry; 1596 struct snd_info_entry *entry;
1597 1597
1598 if (! snd_card_proc_new(ice->card, "ice1712", &entry)) 1598 if (! snd_card_proc_new(ice->card, "ice1712", &entry))
1599 snd_info_set_text_ops(entry, ice, 1024, snd_ice1712_proc_read); 1599 snd_info_set_text_ops(entry, ice, snd_ice1712_proc_read);
1600} 1600}
1601 1601
1602/* 1602/*
diff --git a/sound/pci/ice1712/ice1724.c b/sound/pci/ice1712/ice1724.c
index b1c007e022d2..1031bcbf7064 100644
--- a/sound/pci/ice1712/ice1724.c
+++ b/sound/pci/ice1712/ice1724.c
@@ -1293,7 +1293,7 @@ static void __devinit snd_vt1724_proc_init(struct snd_ice1712 * ice)
1293 struct snd_info_entry *entry; 1293 struct snd_info_entry *entry;
1294 1294
1295 if (! snd_card_proc_new(ice->card, "ice1724", &entry)) 1295 if (! snd_card_proc_new(ice->card, "ice1724", &entry))
1296 snd_info_set_text_ops(entry, ice, 1024, snd_vt1724_proc_read); 1296 snd_info_set_text_ops(entry, ice, snd_vt1724_proc_read);
1297} 1297}
1298 1298
1299/* 1299/*
diff --git a/sound/pci/ice1712/pontis.c b/sound/pci/ice1712/pontis.c
index d23fb3fc2133..0efcad9260a5 100644
--- a/sound/pci/ice1712/pontis.c
+++ b/sound/pci/ice1712/pontis.c
@@ -680,9 +680,8 @@ static void wm_proc_init(struct snd_ice1712 *ice)
680{ 680{
681 struct snd_info_entry *entry; 681 struct snd_info_entry *entry;
682 if (! snd_card_proc_new(ice->card, "wm_codec", &entry)) { 682 if (! snd_card_proc_new(ice->card, "wm_codec", &entry)) {
683 snd_info_set_text_ops(entry, ice, 1024, wm_proc_regs_read); 683 snd_info_set_text_ops(entry, ice, wm_proc_regs_read);
684 entry->mode |= S_IWUSR; 684 entry->mode |= S_IWUSR;
685 entry->c.text.write_size = 1024;
686 entry->c.text.write = wm_proc_regs_write; 685 entry->c.text.write = wm_proc_regs_write;
687 } 686 }
688} 687}
@@ -705,9 +704,8 @@ static void cs_proc_regs_read(struct snd_info_entry *entry, struct snd_info_buff
705static void cs_proc_init(struct snd_ice1712 *ice) 704static void cs_proc_init(struct snd_ice1712 *ice)
706{ 705{
707 struct snd_info_entry *entry; 706 struct snd_info_entry *entry;
708 if (! snd_card_proc_new(ice->card, "cs_codec", &entry)) { 707 if (! snd_card_proc_new(ice->card, "cs_codec", &entry))
709 snd_info_set_text_ops(entry, ice, 1024, cs_proc_regs_read); 708 snd_info_set_text_ops(entry, ice, cs_proc_regs_read);
710 }
711} 709}
712 710
713 711
diff --git a/sound/pci/intel8x0.c b/sound/pci/intel8x0.c
index 0df7602568e2..a4e5b8115a6c 100644
--- a/sound/pci/intel8x0.c
+++ b/sound/pci/intel8x0.c
@@ -2645,7 +2645,7 @@ static void __devinit snd_intel8x0_proc_init(struct intel8x0 * chip)
2645 struct snd_info_entry *entry; 2645 struct snd_info_entry *entry;
2646 2646
2647 if (! snd_card_proc_new(chip->card, "intel8x0", &entry)) 2647 if (! snd_card_proc_new(chip->card, "intel8x0", &entry))
2648 snd_info_set_text_ops(entry, chip, 1024, snd_intel8x0_proc_read); 2648 snd_info_set_text_ops(entry, chip, snd_intel8x0_proc_read);
2649} 2649}
2650#else 2650#else
2651#define snd_intel8x0_proc_init(x) 2651#define snd_intel8x0_proc_init(x)
diff --git a/sound/pci/intel8x0m.c b/sound/pci/intel8x0m.c
index 720635f0cb81..20acb1a7e92c 100644
--- a/sound/pci/intel8x0m.c
+++ b/sound/pci/intel8x0m.c
@@ -1092,7 +1092,7 @@ static void __devinit snd_intel8x0m_proc_init(struct intel8x0m * chip)
1092 struct snd_info_entry *entry; 1092 struct snd_info_entry *entry;
1093 1093
1094 if (! snd_card_proc_new(chip->card, "intel8x0m", &entry)) 1094 if (! snd_card_proc_new(chip->card, "intel8x0m", &entry))
1095 snd_info_set_text_ops(entry, chip, 1024, snd_intel8x0m_proc_read); 1095 snd_info_set_text_ops(entry, chip, snd_intel8x0m_proc_read);
1096} 1096}
1097#else /* !CONFIG_PROC_FS */ 1097#else /* !CONFIG_PROC_FS */
1098#define snd_intel8x0m_proc_init(chip) 1098#define snd_intel8x0m_proc_init(chip)
diff --git a/sound/pci/korg1212/korg1212.c b/sound/pci/korg1212/korg1212.c
index e39fad1a4200..6e97932de34f 100644
--- a/sound/pci/korg1212/korg1212.c
+++ b/sound/pci/korg1212/korg1212.c
@@ -2085,7 +2085,7 @@ static void __devinit snd_korg1212_proc_init(struct snd_korg1212 *korg1212)
2085 struct snd_info_entry *entry; 2085 struct snd_info_entry *entry;
2086 2086
2087 if (! snd_card_proc_new(korg1212->card, "korg1212", &entry)) 2087 if (! snd_card_proc_new(korg1212->card, "korg1212", &entry))
2088 snd_info_set_text_ops(entry, korg1212, 1024, snd_korg1212_proc_read); 2088 snd_info_set_text_ops(entry, korg1212, snd_korg1212_proc_read);
2089} 2089}
2090 2090
2091static int 2091static int
diff --git a/sound/pci/mixart/mixart.c b/sound/pci/mixart/mixart.c
index 09cc0786495a..366c4a7e65c6 100644
--- a/sound/pci/mixart/mixart.c
+++ b/sound/pci/mixart/mixart.c
@@ -1244,7 +1244,6 @@ static void __devinit snd_mixart_proc_init(struct snd_mixart *chip)
1244 /* text interface to read perf and temp meters */ 1244 /* text interface to read perf and temp meters */
1245 if (! snd_card_proc_new(chip->card, "board_info", &entry)) { 1245 if (! snd_card_proc_new(chip->card, "board_info", &entry)) {
1246 entry->private_data = chip; 1246 entry->private_data = chip;
1247 entry->c.text.read_size = 1024;
1248 entry->c.text.read = snd_mixart_proc_read; 1247 entry->c.text.read = snd_mixart_proc_read;
1249 } 1248 }
1250 1249
diff --git a/sound/pci/pcxhr/pcxhr.c b/sound/pci/pcxhr/pcxhr.c
index dafa2235abaa..8198884b51ee 100644
--- a/sound/pci/pcxhr/pcxhr.c
+++ b/sound/pci/pcxhr/pcxhr.c
@@ -1150,9 +1150,9 @@ static void __devinit pcxhr_proc_init(struct snd_pcxhr *chip)
1150 struct snd_info_entry *entry; 1150 struct snd_info_entry *entry;
1151 1151
1152 if (! snd_card_proc_new(chip->card, "info", &entry)) 1152 if (! snd_card_proc_new(chip->card, "info", &entry))
1153 snd_info_set_text_ops(entry, chip, 1024, pcxhr_proc_info); 1153 snd_info_set_text_ops(entry, chip, pcxhr_proc_info);
1154 if (! snd_card_proc_new(chip->card, "sync", &entry)) 1154 if (! snd_card_proc_new(chip->card, "sync", &entry))
1155 snd_info_set_text_ops(entry, chip, 1024, pcxhr_proc_sync); 1155 snd_info_set_text_ops(entry, chip, pcxhr_proc_sync);
1156} 1156}
1157/* end of proc interface */ 1157/* end of proc interface */
1158 1158
diff --git a/sound/pci/riptide/riptide.c b/sound/pci/riptide/riptide.c
index d8cc985d7241..c27cd4999777 100644
--- a/sound/pci/riptide/riptide.c
+++ b/sound/pci/riptide/riptide.c
@@ -1992,7 +1992,7 @@ static void __devinit snd_riptide_proc_init(struct snd_riptide *chip)
1992 struct snd_info_entry *entry; 1992 struct snd_info_entry *entry;
1993 1993
1994 if (!snd_card_proc_new(chip->card, "riptide", &entry)) 1994 if (!snd_card_proc_new(chip->card, "riptide", &entry))
1995 snd_info_set_text_ops(entry, chip, 4096, snd_riptide_proc_read); 1995 snd_info_set_text_ops(entry, chip, snd_riptide_proc_read);
1996} 1996}
1997 1997
1998static int __devinit snd_riptide_mixer(struct snd_riptide *chip) 1998static int __devinit snd_riptide_mixer(struct snd_riptide *chip)
diff --git a/sound/pci/rme32.c b/sound/pci/rme32.c
index 55b1d4838d97..4dd53bfe0308 100644
--- a/sound/pci/rme32.c
+++ b/sound/pci/rme32.c
@@ -1578,7 +1578,7 @@ static void __devinit snd_rme32_proc_init(struct rme32 * rme32)
1578 struct snd_info_entry *entry; 1578 struct snd_info_entry *entry;
1579 1579
1580 if (! snd_card_proc_new(rme32->card, "rme32", &entry)) 1580 if (! snd_card_proc_new(rme32->card, "rme32", &entry))
1581 snd_info_set_text_ops(entry, rme32, 1024, snd_rme32_proc_read); 1581 snd_info_set_text_ops(entry, rme32, snd_rme32_proc_read);
1582} 1582}
1583 1583
1584/* 1584/*
diff --git a/sound/pci/rme96.c b/sound/pci/rme96.c
index 3c1bc533d511..75a8b754ef28 100644
--- a/sound/pci/rme96.c
+++ b/sound/pci/rme96.c
@@ -1805,7 +1805,7 @@ snd_rme96_proc_init(struct rme96 *rme96)
1805 struct snd_info_entry *entry; 1805 struct snd_info_entry *entry;
1806 1806
1807 if (! snd_card_proc_new(rme96->card, "rme96", &entry)) 1807 if (! snd_card_proc_new(rme96->card, "rme96", &entry))
1808 snd_info_set_text_ops(entry, rme96, 1024, snd_rme96_proc_read); 1808 snd_info_set_text_ops(entry, rme96, snd_rme96_proc_read);
1809} 1809}
1810 1810
1811/* 1811/*
diff --git a/sound/pci/rme9652/hdsp.c b/sound/pci/rme9652/hdsp.c
index 61f82f0d5cc6..da63a1a19958 100644
--- a/sound/pci/rme9652/hdsp.c
+++ b/sound/pci/rme9652/hdsp.c
@@ -3470,7 +3470,7 @@ static void __devinit snd_hdsp_proc_init(struct hdsp *hdsp)
3470 struct snd_info_entry *entry; 3470 struct snd_info_entry *entry;
3471 3471
3472 if (! snd_card_proc_new(hdsp->card, "hdsp", &entry)) 3472 if (! snd_card_proc_new(hdsp->card, "hdsp", &entry))
3473 snd_info_set_text_ops(entry, hdsp, 1024, snd_hdsp_proc_read); 3473 snd_info_set_text_ops(entry, hdsp, snd_hdsp_proc_read);
3474} 3474}
3475 3475
3476static void snd_hdsp_free_buffers(struct hdsp *hdsp) 3476static void snd_hdsp_free_buffers(struct hdsp *hdsp)
diff --git a/sound/pci/rme9652/hdspm.c b/sound/pci/rme9652/hdspm.c
index 722b9e6ce54a..bba1615504d3 100644
--- a/sound/pci/rme9652/hdspm.c
+++ b/sound/pci/rme9652/hdspm.c
@@ -2489,7 +2489,7 @@ static void __devinit snd_hdspm_proc_init(struct hdspm * hdspm)
2489 struct snd_info_entry *entry; 2489 struct snd_info_entry *entry;
2490 2490
2491 if (!snd_card_proc_new(hdspm->card, "hdspm", &entry)) 2491 if (!snd_card_proc_new(hdspm->card, "hdspm", &entry))
2492 snd_info_set_text_ops(entry, hdspm, 1024, 2492 snd_info_set_text_ops(entry, hdspm,
2493 snd_hdspm_proc_read); 2493 snd_hdspm_proc_read);
2494} 2494}
2495 2495
diff --git a/sound/pci/rme9652/rme9652.c b/sound/pci/rme9652/rme9652.c
index 75d6406303d3..ac14b2733f7c 100644
--- a/sound/pci/rme9652/rme9652.c
+++ b/sound/pci/rme9652/rme9652.c
@@ -1787,7 +1787,7 @@ static void __devinit snd_rme9652_proc_init(struct snd_rme9652 *rme9652)
1787 struct snd_info_entry *entry; 1787 struct snd_info_entry *entry;
1788 1788
1789 if (! snd_card_proc_new(rme9652->card, "rme9652", &entry)) 1789 if (! snd_card_proc_new(rme9652->card, "rme9652", &entry))
1790 snd_info_set_text_ops(entry, rme9652, 1024, snd_rme9652_proc_read); 1790 snd_info_set_text_ops(entry, rme9652, snd_rme9652_proc_read);
1791} 1791}
1792 1792
1793static void snd_rme9652_free_buffers(struct snd_rme9652 *rme9652) 1793static void snd_rme9652_free_buffers(struct snd_rme9652 *rme9652)
diff --git a/sound/pci/sonicvibes.c b/sound/pci/sonicvibes.c
index 91f8bf3ae9fa..a78304172921 100644
--- a/sound/pci/sonicvibes.c
+++ b/sound/pci/sonicvibes.c
@@ -1144,7 +1144,7 @@ static void __devinit snd_sonicvibes_proc_init(struct sonicvibes * sonic)
1144 struct snd_info_entry *entry; 1144 struct snd_info_entry *entry;
1145 1145
1146 if (! snd_card_proc_new(sonic->card, "sonicvibes", &entry)) 1146 if (! snd_card_proc_new(sonic->card, "sonicvibes", &entry))
1147 snd_info_set_text_ops(entry, sonic, 1024, snd_sonicvibes_proc_read); 1147 snd_info_set_text_ops(entry, sonic, snd_sonicvibes_proc_read);
1148} 1148}
1149 1149
1150/* 1150/*
diff --git a/sound/pci/trident/trident_main.c b/sound/pci/trident/trident_main.c
index 850579208e49..d99ed7237750 100644
--- a/sound/pci/trident/trident_main.c
+++ b/sound/pci/trident/trident_main.c
@@ -3338,7 +3338,7 @@ static void __devinit snd_trident_proc_init(struct snd_trident * trident)
3338 if (trident->device == TRIDENT_DEVICE_ID_SI7018) 3338 if (trident->device == TRIDENT_DEVICE_ID_SI7018)
3339 s = "sis7018"; 3339 s = "sis7018";
3340 if (! snd_card_proc_new(trident->card, s, &entry)) 3340 if (! snd_card_proc_new(trident->card, s, &entry))
3341 snd_info_set_text_ops(entry, trident, 1024, snd_trident_proc_read); 3341 snd_info_set_text_ops(entry, trident, snd_trident_proc_read);
3342} 3342}
3343 3343
3344static int snd_trident_dev_free(struct snd_device *device) 3344static int snd_trident_dev_free(struct snd_device *device)
diff --git a/sound/pci/via82xx.c b/sound/pci/via82xx.c
index 39daf62d2bad..a1b777e79c59 100644
--- a/sound/pci/via82xx.c
+++ b/sound/pci/via82xx.c
@@ -2015,7 +2015,7 @@ static void __devinit snd_via82xx_proc_init(struct via82xx *chip)
2015 struct snd_info_entry *entry; 2015 struct snd_info_entry *entry;
2016 2016
2017 if (! snd_card_proc_new(chip->card, "via82xx", &entry)) 2017 if (! snd_card_proc_new(chip->card, "via82xx", &entry))
2018 snd_info_set_text_ops(entry, chip, 1024, snd_via82xx_proc_read); 2018 snd_info_set_text_ops(entry, chip, snd_via82xx_proc_read);
2019} 2019}
2020 2020
2021/* 2021/*
diff --git a/sound/pci/via82xx_modem.c b/sound/pci/via82xx_modem.c
index ef97e50cd6c2..577a2b03759f 100644
--- a/sound/pci/via82xx_modem.c
+++ b/sound/pci/via82xx_modem.c
@@ -929,7 +929,7 @@ static void __devinit snd_via82xx_proc_init(struct via82xx_modem *chip)
929 struct snd_info_entry *entry; 929 struct snd_info_entry *entry;
930 930
931 if (! snd_card_proc_new(chip->card, "via82xx", &entry)) 931 if (! snd_card_proc_new(chip->card, "via82xx", &entry))
932 snd_info_set_text_ops(entry, chip, 1024, snd_via82xx_proc_read); 932 snd_info_set_text_ops(entry, chip, snd_via82xx_proc_read);
933} 933}
934 934
935/* 935/*
diff --git a/sound/pci/ymfpci/ymfpci_main.c b/sound/pci/ymfpci/ymfpci_main.c
index 8ac5ab50b5c7..f894752523bb 100644
--- a/sound/pci/ymfpci/ymfpci_main.c
+++ b/sound/pci/ymfpci/ymfpci_main.c
@@ -1919,7 +1919,7 @@ static int __devinit snd_ymfpci_proc_init(struct snd_card *card, struct snd_ymfp
1919 struct snd_info_entry *entry; 1919 struct snd_info_entry *entry;
1920 1920
1921 if (! snd_card_proc_new(card, "ymfpci", &entry)) 1921 if (! snd_card_proc_new(card, "ymfpci", &entry))
1922 snd_info_set_text_ops(entry, chip, 1024, snd_ymfpci_proc_read); 1922 snd_info_set_text_ops(entry, chip, snd_ymfpci_proc_read);
1923 return 0; 1923 return 0;
1924} 1924}
1925 1925
diff --git a/sound/pcmcia/pdaudiocf/pdaudiocf_core.c b/sound/pcmcia/pdaudiocf/pdaudiocf_core.c
index bd0d70ff3019..1dfe29b863d3 100644
--- a/sound/pcmcia/pdaudiocf/pdaudiocf_core.c
+++ b/sound/pcmcia/pdaudiocf/pdaudiocf_core.c
@@ -144,7 +144,7 @@ static void pdacf_proc_init(struct snd_pdacf *chip)
144 struct snd_info_entry *entry; 144 struct snd_info_entry *entry;
145 145
146 if (! snd_card_proc_new(chip->card, "pdaudiocf", &entry)) 146 if (! snd_card_proc_new(chip->card, "pdaudiocf", &entry))
147 snd_info_set_text_ops(entry, chip, 1024, pdacf_proc_read); 147 snd_info_set_text_ops(entry, chip, pdacf_proc_read);
148} 148}
149 149
150struct snd_pdacf *snd_pdacf_create(struct snd_card *card) 150struct snd_pdacf *snd_pdacf_create(struct snd_card *card)
diff --git a/sound/sparc/dbri.c b/sound/sparc/dbri.c
index e622d08215c9..db6539126d27 100644
--- a/sound/sparc/dbri.c
+++ b/sound/sparc/dbri.c
@@ -2521,11 +2521,11 @@ void snd_dbri_proc(struct snd_dbri * dbri)
2521 struct snd_info_entry *entry; 2521 struct snd_info_entry *entry;
2522 2522
2523 if (! snd_card_proc_new(dbri->card, "regs", &entry)) 2523 if (! snd_card_proc_new(dbri->card, "regs", &entry))
2524 snd_info_set_text_ops(entry, dbri, 1024, dbri_regs_read); 2524 snd_info_set_text_ops(entry, dbri, dbri_regs_read);
2525 2525
2526#ifdef DBRI_DEBUG 2526#ifdef DBRI_DEBUG
2527 if (! snd_card_proc_new(dbri->card, "debug", &entry)) { 2527 if (! snd_card_proc_new(dbri->card, "debug", &entry)) {
2528 snd_info_set_text_ops(entry, dbri, 4096, dbri_debug_read); 2528 snd_info_set_text_ops(entry, dbri, dbri_debug_read);
2529 entry->mode = S_IFREG | S_IRUGO; /* Readable only. */ 2529 entry->mode = S_IFREG | S_IRUGO; /* Readable only. */
2530 } 2530 }
2531#endif 2531#endif
diff --git a/sound/synth/emux/emux_proc.c b/sound/synth/emux/emux_proc.c
index 1ba68ce30279..58b9601f3ad0 100644
--- a/sound/synth/emux/emux_proc.c
+++ b/sound/synth/emux/emux_proc.c
@@ -119,7 +119,6 @@ void snd_emux_proc_init(struct snd_emux *emu, struct snd_card *card, int device)
119 119
120 entry->content = SNDRV_INFO_CONTENT_TEXT; 120 entry->content = SNDRV_INFO_CONTENT_TEXT;
121 entry->private_data = emu; 121 entry->private_data = emu;
122 entry->c.text.read_size = 1024;
123 entry->c.text.read = snd_emux_proc_info_read; 122 entry->c.text.read = snd_emux_proc_info_read;
124 if (snd_info_register(entry) < 0) 123 if (snd_info_register(entry) < 0)
125 snd_info_free_entry(entry); 124 snd_info_free_entry(entry);
diff --git a/sound/usb/usbaudio.c b/sound/usb/usbaudio.c
index 4e614ac39f21..8100516e1f79 100644
--- a/sound/usb/usbaudio.c
+++ b/sound/usb/usbaudio.c
@@ -2138,7 +2138,7 @@ static void proc_pcm_format_add(struct snd_usb_stream *stream)
2138 2138
2139 sprintf(name, "stream%d", stream->pcm_index); 2139 sprintf(name, "stream%d", stream->pcm_index);
2140 if (! snd_card_proc_new(card, name, &entry)) 2140 if (! snd_card_proc_new(card, name, &entry))
2141 snd_info_set_text_ops(entry, stream, 1024, proc_pcm_format_read); 2141 snd_info_set_text_ops(entry, stream, proc_pcm_format_read);
2142} 2142}
2143 2143
2144#else 2144#else
@@ -3197,9 +3197,9 @@ static void snd_usb_audio_create_proc(struct snd_usb_audio *chip)
3197{ 3197{
3198 struct snd_info_entry *entry; 3198 struct snd_info_entry *entry;
3199 if (! snd_card_proc_new(chip->card, "usbbus", &entry)) 3199 if (! snd_card_proc_new(chip->card, "usbbus", &entry))
3200 snd_info_set_text_ops(entry, chip, 1024, proc_audio_usbbus_read); 3200 snd_info_set_text_ops(entry, chip, proc_audio_usbbus_read);
3201 if (! snd_card_proc_new(chip->card, "usbid", &entry)) 3201 if (! snd_card_proc_new(chip->card, "usbid", &entry))
3202 snd_info_set_text_ops(entry, chip, 1024, proc_audio_usbid_read); 3202 snd_info_set_text_ops(entry, chip, proc_audio_usbid_read);
3203} 3203}
3204 3204
3205/* 3205/*
diff --git a/sound/usb/usbmixer.c b/sound/usb/usbmixer.c
index ce86283ee0fa..ab921aa9d77a 100644
--- a/sound/usb/usbmixer.c
+++ b/sound/usb/usbmixer.c
@@ -1998,7 +1998,7 @@ int snd_usb_create_mixer(struct snd_usb_audio *chip, int ctrlif)
1998 if ((err = snd_audigy2nx_controls_create(mixer)) < 0) 1998 if ((err = snd_audigy2nx_controls_create(mixer)) < 0)
1999 goto _error; 1999 goto _error;
2000 if (!snd_card_proc_new(chip->card, "audigy2nx", &entry)) 2000 if (!snd_card_proc_new(chip->card, "audigy2nx", &entry))
2001 snd_info_set_text_ops(entry, mixer, 1024, 2001 snd_info_set_text_ops(entry, mixer,
2002 snd_audigy2nx_proc_read); 2002 snd_audigy2nx_proc_read);
2003 } 2003 }
2004 2004