diff options
Diffstat (limited to 'sound/sparc/dbri.c')
| -rw-r--r-- | sound/sparc/dbri.c | 19 | 
1 files changed, 5 insertions, 14 deletions
diff --git a/sound/sparc/dbri.c b/sound/sparc/dbri.c index 9e71d7cda999..2b8ef5fe6688 100644 --- a/sound/sparc/dbri.c +++ b/sound/sparc/dbri.c @@ -2243,12 +2243,9 @@ static int snd_dbri_pcm(struct snd_card *card)  	pcm->info_flags = 0;  	strcpy(pcm->name, card->shortname); -	if ((err = snd_pcm_lib_preallocate_pages_for_all(pcm, -			SNDRV_DMA_TYPE_CONTINUOUS, -			snd_dma_continuous_data(GFP_KERNEL), -			64 * 1024, 64 * 1024)) < 0) -		return err; - +	snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_CONTINUOUS, +					      snd_dma_continuous_data(GFP_KERNEL), +					      64 * 1024, 64 * 1024);  	return 0;  } @@ -2510,16 +2507,10 @@ static void dbri_debug_read(struct snd_info_entry *entry,  static void snd_dbri_proc(struct snd_card *card)  {  	struct snd_dbri *dbri = card->private_data; -	struct snd_info_entry *entry; - -	if (!snd_card_proc_new(card, "regs", &entry)) -		snd_info_set_text_ops(entry, dbri, dbri_regs_read); +	snd_card_ro_proc_new(card, "regs", dbri, dbri_regs_read);  #ifdef DBRI_DEBUG -	if (!snd_card_proc_new(card, "debug", &entry)) { -		snd_info_set_text_ops(entry, dbri, dbri_debug_read); -		entry->mode = S_IFREG | 0444;	/* Readable only. */ -	} +	snd_card_ro_proc_new(card, "debug", dbri, dbri_debug_read);  #endif  }  |