14 files changed, 15 insertions, 32 deletions

diff --git a/sound/core/hwdep.c b/sound/core/hwdep.c
index 2524e66eccd..8bd0dcc93eb 100644
--- a/sound/core/hwdep.c
+++ b/sound/core/hwdep.c
@@ -486,7 +486,6 @@ static void __init snd_hwdep_proc_init(void)
         struct snd_info_entry *entry;
 
         if ((entry = snd_info_create_module_entry(THIS_MODULE, "hwdep", NULL)) != NULL) {
-                entry->c.text.read_size = PAGE_SIZE;
                 entry->c.text.read = snd_hwdep_proc_read;
                 if (snd_info_register(entry) < 0) {
                         snd_info_free_entry(entry);
diff --git a/sound/core/info_oss.c b/sound/core/info_oss.c
index f2efca18728..bb2c40d0ab6 100644
--- a/sound/core/info_oss.c
+++ b/sound/core/info_oss.c
@@ -119,7 +119,6 @@ int snd_info_minor_register(void)
 
         memset(snd_sndstat_strings, 0, sizeof(snd_sndstat_strings));
         if ((entry = snd_info_create_module_entry(THIS_MODULE, "sndstat", snd_oss_root)) != NULL) {
-                entry->c.text.read_size = 2048;
                 entry->c.text.read = snd_sndstat_proc_read;
                 if (snd_info_register(entry) < 0) {
                         snd_info_free_entry(entry);
diff --git a/sound/core/init.c b/sound/core/init.c
index b145d17ba3b..2ff0e5e9086 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)
                 snd_printd("unable to create card entry\n");
                 return err;
         }
-        entry->c.text.read_size = PAGE_SIZE;
         entry->c.text.read = snd_card_id_read;
         if (snd_info_register(entry) < 0) {
                 snd_info_free_entry(entry);
@@ -592,7 +591,6 @@ int __init snd_card_info_init(void)
         entry = snd_info_create_module_entry(THIS_MODULE, "cards", NULL);
         if (! entry)
                 return -ENOMEM;
-        entry->c.text.read_size = PAGE_SIZE;
         entry->c.text.read = snd_card_info_read;
         if (snd_info_register(entry) < 0) {
                 snd_info_free_entry(entry);
@@ -603,7 +601,6 @@ int __init snd_card_info_init(void)
 #ifdef MODULE
         entry = snd_info_create_module_entry(THIS_MODULE, "modules", NULL);
         if (entry) {
-                entry->c.text.read_size = PAGE_SIZE;
                 entry->c.text.read = snd_card_module_info_read;
                 if (snd_info_register(entry) < 0)
                         snd_info_free_entry(entry);
diff --git a/sound/core/oss/mixer_oss.c b/sound/core/oss/mixer_oss.c
index 9c68bc3f97a..71b5080fa66 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)
                 return;
         entry->content = SNDRV_INFO_CONTENT_TEXT;
         entry->mode = S_IFREG | S_IRUGO | S_IWUSR;
-        entry->c.text.read_size = 8192;
         entry->c.text.read = snd_mixer_oss_proc_read;
-        entry->c.text.write_size = 8192;
         entry->c.text.write = snd_mixer_oss_proc_write;
         entry->private_data = mixer;
         if (snd_info_register(entry) < 0) {
diff --git a/sound/core/oss/pcm_oss.c b/sound/core/oss/pcm_oss.c
index 0d2e232afe6..d8b7416ee00 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)
                 if ((entry = snd_info_create_card_entry(pcm->card, "oss", pstr->proc_root)) != NULL) {
                         entry->content = SNDRV_INFO_CONTENT_TEXT;
                         entry->mode = S_IFREG | S_IRUGO | S_IWUSR;
-                        entry->c.text.read_size = 8192;
                         entry->c.text.read = snd_pcm_oss_proc_read;
-                        entry->c.text.write_size = 8192;
                         entry->c.text.write = snd_pcm_oss_proc_write;
                         entry->private_data = pstr;
                         if (snd_info_register(entry) < 0) {
diff --git a/sound/core/pcm.c b/sound/core/pcm.c
index 8c15c01907f..08223783cfa 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)
         pstr->proc_root = entry;
 
         if ((entry = snd_info_create_card_entry(pcm->card, "info", pstr->proc_root)) != NULL) {
-                snd_info_set_text_ops(entry, pstr, 256, snd_pcm_stream_proc_info_read);
+                snd_info_set_text_ops(entry, pstr, snd_pcm_stream_proc_info_read);
                 if (snd_info_register(entry) < 0) {
                         snd_info_free_entry(entry);
                         entry = NULL;
@@ -483,9 +483,7 @@ static int snd_pcm_stream_proc_init(struct snd_pcm_str *pstr)
 #ifdef CONFIG_SND_PCM_XRUN_DEBUG
         if ((entry = snd_info_create_card_entry(pcm->card, "xrun_debug",
                                                 pstr->proc_root)) != NULL) {
-                entry->c.text.read_size = 64;
                 entry->c.text.read = snd_pcm_xrun_debug_read;
-                entry->c.text.write_size = 64;
                 entry->c.text.write = snd_pcm_xrun_debug_write;
                 entry->mode |= S_IWUSR;
                 entry->private_data = pstr;
@@ -537,7 +535,8 @@ static int snd_pcm_substream_proc_init(struct snd_pcm_substream *substream)
         substream->proc_root = entry;
 
         if ((entry = snd_info_create_card_entry(card, "info", substream->proc_root)) != NULL) {
-                snd_info_set_text_ops(entry, substream, 256, snd_pcm_substream_proc_info_read);
+                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 = NULL;
@@ -546,7 +545,8 @@ static int snd_pcm_substream_proc_init(struct snd_pcm_substream *substream)
         substream->proc_info_entry = entry;
 
         if ((entry = snd_info_create_card_entry(card, "hw_params", substream->proc_root)) != NULL) {
-                snd_info_set_text_ops(entry, substream, 256, snd_pcm_substream_proc_hw_params_read);
+                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 = NULL;
@@ -555,7 +555,8 @@ static int snd_pcm_substream_proc_init(struct snd_pcm_substream *substream)
         substream->proc_hw_params_entry = entry;
 
         if ((entry = snd_info_create_card_entry(card, "sw_params", substream->proc_root)) != NULL) {
-                snd_info_set_text_ops(entry, substream, 256, snd_pcm_substream_proc_sw_params_read);
+                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 = NULL;
@@ -564,7 +565,8 @@ static int snd_pcm_substream_proc_init(struct snd_pcm_substream *substream)
         substream->proc_sw_params_entry = entry;
 
         if ((entry = snd_info_create_card_entry(card, "status", substream->proc_root)) != NULL) {
-                snd_info_set_text_ops(entry, substream, 256, snd_pcm_substream_proc_status_read);
+                snd_info_set_text_ops(entry, substream,
+                                      snd_pcm_substream_proc_status_read);
                 if (snd_info_register(entry) < 0) {
                         snd_info_free_entry(entry);
                         entry = NULL;
@@ -1062,8 +1064,7 @@ static void snd_pcm_proc_init(void)
         struct snd_info_entry *entry;
 
         if ((entry = snd_info_create_module_entry(THIS_MODULE, "pcm", NULL)) != NULL) {
-                snd_info_set_text_ops(entry, NULL, SNDRV_CARDS * SNDRV_PCM_DEVICES * 128,
-                                      snd_pcm_proc_read);
+                snd_info_set_text_ops(entry, NULL, snd_pcm_proc_read);
                 if (snd_info_register(entry) < 0) {
                         snd_info_free_entry(entry);
                         entry = NULL;
diff --git a/sound/core/pcm_memory.c b/sound/core/pcm_memory.c
index eb56167d3bb..067d2056db9 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)
         struct snd_info_entry *entry;
 
         if ((entry = snd_info_create_card_entry(substream->pcm->card, "prealloc", substream->proc_root)) != NULL) {
-                entry->c.text.read_size = 64;
                 entry->c.text.read = snd_pcm_lib_preallocate_proc_read;
-                entry->c.text.write_size = 64;
                 entry->c.text.write = snd_pcm_lib_preallocate_proc_write;
                 entry->mode |= S_IWUSR;
                 entry->private_data = substream;
diff --git a/sound/core/rawmidi.c b/sound/core/rawmidi.c
index 87b47c9564f..08a41e5023c 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)
         entry = snd_info_create_card_entry(rmidi->card, name, rmidi->card->proc_root);
         if (entry) {
                 entry->private_data = rmidi;
-                entry->c.text.read_size = 1024;
                 entry->c.text.read = snd_rawmidi_proc_info_read;
                 if (snd_info_register(entry) < 0) {
                         snd_info_free_entry(entry);
diff --git a/sound/core/seq/oss/seq_oss.c b/sound/core/seq/oss/seq_oss.c
index b9919785180..e7234135641 100644
--- a/sound/core/seq/oss/seq_oss.c
+++ b/sound/core/seq/oss/seq_oss.c
@@ -291,7 +291,6 @@ register_proc(void)
 
         entry->content = SNDRV_INFO_CONTENT_TEXT;
         entry->private_data = NULL;
-        entry->c.text.read_size = 1024;
         entry->c.text.read = info_read;
         if (snd_info_register(entry) < 0) {
                 snd_info_free_entry(entry);
diff --git a/sound/core/seq/seq_device.c b/sound/core/seq/seq_device.c
index d9a3e5a18d6..1e4bc402f00 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)
         if (info_entry == NULL)
                 return -ENOMEM;
         info_entry->content = SNDRV_INFO_CONTENT_TEXT;
-        info_entry->c.text.read_size = 2048;
         info_entry->c.text.read = snd_seq_device_info;
         if (snd_info_register(info_entry) < 0) {
                 snd_info_free_entry(info_entry);
diff --git a/sound/core/seq/seq_info.c b/sound/core/seq/seq_info.c
index acce21afdaa..142e9e6882c 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;
 
 
 static struct snd_info_entry * __init
-create_info_entry(char *name, int size, void (*read)(struct snd_info_entry *,
-                                                     struct snd_info_buffer *))
+create_info_entry(char *name, void (*read)(struct snd_info_entry *,
+                                           struct snd_info_buffer *))
 {
         struct snd_info_entry *entry;
 
@@ -43,7 +43,6 @@ create_info_entry(char *name, int size, void (*read)(struct snd_info_entry *,
         if (entry == NULL)
                 return NULL;
         entry->content = SNDRV_INFO_CONTENT_TEXT;
-        entry->c.text.read_size = size;
         entry->c.text.read = read;
         if (snd_info_register(entry) < 0) {
                 snd_info_free_entry(entry);
@@ -55,11 +54,11 @@ create_info_entry(char *name, int size, void (*read)(struct snd_info_entry *,
 /* create all our /proc entries */
 int __init snd_seq_info_init(void)
 {
-        queues_entry = create_info_entry("queues", 512 + (256 * SNDRV_SEQ_MAX_QUEUES),
+        queues_entry = create_info_entry("queues",
                                          snd_seq_info_queues_read);
-        clients_entry = create_info_entry("clients", 512 + (256 * SNDRV_SEQ_MAX_CLIENTS),
+        clients_entry = create_info_entry("clients",
                                           snd_seq_info_clients_read);
-        timer_entry = create_info_entry("timer", 1024, snd_seq_info_timer_read);
+        timer_entry = create_info_entry("timer", snd_seq_info_timer_read);
         return 0;
 }
 
diff --git a/sound/core/sound.c b/sound/core/sound.c
index 67cfa06062b..8313f97907d 100644
--- a/sound/core/sound.c
+++ b/sound/core/sound.c
@@ -392,7 +392,6 @@ int __init snd_minor_info_init(void)
 
         entry = snd_info_create_module_entry(THIS_MODULE, "devices", NULL);
         if (entry) {
-                entry->c.text.read_size = PAGE_SIZE;
                 entry->c.text.read = snd_minor_info_read;
                 if (snd_info_register(entry) < 0) {
                         snd_info_free_entry(entry);
diff --git a/sound/core/sound_oss.c b/sound/core/sound_oss.c
index c18f6a45e4d..0043c9a97de 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)
 
         entry = snd_info_create_module_entry(THIS_MODULE, "devices", snd_oss_root);
         if (entry) {
-                entry->c.text.read_size = PAGE_SIZE;
                 entry->c.text.read = snd_minor_info_oss_read;
                 if (snd_info_register(entry) < 0) {
                         snd_info_free_entry(entry);
diff --git a/sound/core/timer.c b/sound/core/timer.c
index cdeeb639b67..9a1e51c7c23 100644
--- a/sound/core/timer.c
+++ b/sound/core/timer.c
@@ -1117,7 +1117,6 @@ static void __init snd_timer_proc_init(void)
 
         entry = snd_info_create_module_entry(THIS_MODULE, "timers", NULL);
         if (entry != NULL) {
-                entry->c.text.read_size = SNDRV_TIMER_DEVICES * 128;
                 entry->c.text.read = snd_timer_proc_read;
                 if (snd_info_register(entry) < 0) {
                         snd_info_free_entry(entry);