diff options
Diffstat (limited to 'sound/core/pcm.c')
-rw-r--r-- | sound/core/pcm.c | 19 |
1 files changed, 10 insertions, 9 deletions
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; |