Commit 30f2ce71 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: mips: Convert to the common vmalloc memalloc 

The recent change (*) in the ALSA memalloc core allows us to drop the
special vmalloc-specific allocation and page handling.  This patch
coverts to the common code.
(*) 1fe7f397: ALSA: memalloc: Add vmalloc buffer allocation
                  support
    7e8edae3: ALSA: pcm: Handle special page mapping in the
                  default mmap handler

Link: https://lore.kernel.org/r/20191105151856.10785-18-tiwai@suse.de


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent d5dec270

sound/mips/sgio2audio.c

+6 −6
Original line number Diff line number Diff line
@@ -582,14 +582,13 @@ static int snd_sgio2audio_pcm_close(struct snd_pcm_substream *substream) 
static int snd_sgio2audio_pcm_hw_params(struct snd_pcm_substream *substream,

					struct snd_pcm_hw_params *hw_params)

{

	return snd_pcm_lib_alloc_vmalloc_buffer(substream,

						params_buffer_bytes(hw_params));

	return snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params));

}



/* hw_free callback */

static int snd_sgio2audio_pcm_hw_free(struct snd_pcm_substream *substream)

{

	return snd_pcm_lib_free_vmalloc_buffer(substream);

	return snd_pcm_lib_free_pages(substream);

}



/* prepare callback */
@@ -670,7 +669,6 @@ static const struct snd_pcm_ops snd_sgio2audio_playback1_ops = { 
	.prepare =     snd_sgio2audio_pcm_prepare,

	.trigger =     snd_sgio2audio_pcm_trigger,

	.pointer =     snd_sgio2audio_pcm_pointer,

	.page =        snd_pcm_lib_get_vmalloc_page,

};



static const struct snd_pcm_ops snd_sgio2audio_playback2_ops = {
@@ -682,7 +680,6 @@ static const struct snd_pcm_ops snd_sgio2audio_playback2_ops = { 
	.prepare =     snd_sgio2audio_pcm_prepare,

	.trigger =     snd_sgio2audio_pcm_trigger,

	.pointer =     snd_sgio2audio_pcm_pointer,

	.page =        snd_pcm_lib_get_vmalloc_page,

};



static const struct snd_pcm_ops snd_sgio2audio_capture_ops = {
@@ -694,7 +691,6 @@ static const struct snd_pcm_ops snd_sgio2audio_capture_ops = { 
	.prepare =     snd_sgio2audio_pcm_prepare,

	.trigger =     snd_sgio2audio_pcm_trigger,

	.pointer =     snd_sgio2audio_pcm_pointer,

	.page =        snd_pcm_lib_get_vmalloc_page,

};



/*
@@ -720,6 +716,8 @@ static int snd_sgio2audio_new_pcm(struct snd_sgio2audio *chip) 
			&snd_sgio2audio_playback1_ops);

	snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE,

			&snd_sgio2audio_capture_ops);

	snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_VMALLOC,

					      NULL, 0, 0);



	/* create second  pcm device with one outputs and no input */

	err = snd_pcm_new(chip->card, "SGI O2 Audio", 1, 1, 0, &pcm);
@@ -732,6 +730,8 @@ static int snd_sgio2audio_new_pcm(struct snd_sgio2audio *chip) 
	/* set operators */

	snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK,

			&snd_sgio2audio_playback2_ops);

	snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_VMALLOC,

					      NULL, 0, 0);



	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE