Skip to content

Commit

Permalink
ALSA: pdaudiocf: Convert to the common vmalloc memalloc
Browse files Browse the repository at this point in the history
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.
(*) 1fe7f39: ALSA: memalloc: Add vmalloc buffer allocation
                  support
    7e8edae: ALSA: pcm: Handle special page mapping in the
                  default mmap handler

Since the driver requires the DMA32 allocation, it passes the
specially encoded device to snd_pcm_lib_preallocate_pages().

Link: https://lore.kernel.org/r/20191105151856.10785-17-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
  • Loading branch information
Takashi Iwai committed Nov 6, 2019
1 parent 748a76b commit d5dec27
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions sound/pcmcia/pdaudiocf/pdaudiocf_pcm.c
Original file line number Diff line number Diff line change
Expand Up @@ -89,16 +89,15 @@ static int pdacf_pcm_trigger(struct snd_pcm_substream *subs, int cmd)
static int pdacf_pcm_hw_params(struct snd_pcm_substream *subs,
struct snd_pcm_hw_params *hw_params)
{
return snd_pcm_lib_alloc_vmalloc_32_buffer
(subs, params_buffer_bytes(hw_params));
return snd_pcm_lib_malloc_pages(subs, params_buffer_bytes(hw_params));
}

/*
* pdacf_pcm_hw_free - hw_free callback for playback and capture
*/
static int pdacf_pcm_hw_free(struct snd_pcm_substream *subs)
{
return snd_pcm_lib_free_vmalloc_buffer(subs);
return snd_pcm_lib_free_pages(subs);
}

/*
Expand Down Expand Up @@ -262,7 +261,6 @@ static const struct snd_pcm_ops pdacf_pcm_capture_ops = {
.prepare = pdacf_pcm_prepare,
.trigger = pdacf_pcm_trigger,
.pointer = pdacf_pcm_capture_pointer,
.page = snd_pcm_lib_get_vmalloc_page,
};


Expand All @@ -279,6 +277,9 @@ int snd_pdacf_pcm_new(struct snd_pdacf *chip)
return err;

snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &pdacf_pcm_capture_ops);
snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_VMALLOC,
snd_dma_continuous_data(GFP_KERNEL | GFP_DMA32),
0, 0);

pcm->private_data = chip;
pcm->info_flags = 0;
Expand Down

0 comments on commit d5dec27

Please sign in to comment.