mirror of
https://github.com/torvalds/linux.git
synced 2024-12-28 13:51:44 +00:00
ALSA: ps3: Use managed buffer allocation
Clean up the driver with the new managed buffer allocation API. The hw_params and hw_free callbacks became superfluous and got dropped. Link: https://lore.kernel.org/r/20191209094943.14984-60-tiwai@suse.de Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
parent
01001fa1c7
commit
377d870e54
@ -535,22 +535,6 @@ static int snd_ps3_pcm_close(struct snd_pcm_substream *substream)
|
||||
return 0;
|
||||
};
|
||||
|
||||
static int snd_ps3_pcm_hw_params(struct snd_pcm_substream *substream,
|
||||
struct snd_pcm_hw_params *hw_params)
|
||||
{
|
||||
size_t size;
|
||||
|
||||
/* alloc transport buffer */
|
||||
size = params_buffer_bytes(hw_params);
|
||||
snd_pcm_lib_malloc_pages(substream, size);
|
||||
return 0;
|
||||
};
|
||||
|
||||
static int snd_ps3_pcm_hw_free(struct snd_pcm_substream *substream)
|
||||
{
|
||||
return snd_pcm_lib_free_pages(substream);
|
||||
};
|
||||
|
||||
static int snd_ps3_delay_to_bytes(struct snd_pcm_substream *substream,
|
||||
unsigned int delay_ms)
|
||||
{
|
||||
@ -759,8 +743,6 @@ static const struct snd_pcm_ops snd_ps3_pcm_spdif_ops = {
|
||||
.open = snd_ps3_pcm_open,
|
||||
.close = snd_ps3_pcm_close,
|
||||
.ioctl = snd_pcm_lib_ioctl,
|
||||
.hw_params = snd_ps3_pcm_hw_params,
|
||||
.hw_free = snd_ps3_pcm_hw_free,
|
||||
.prepare = snd_ps3_pcm_prepare,
|
||||
.trigger = snd_ps3_pcm_trigger,
|
||||
.pointer = snd_ps3_pcm_pointer,
|
||||
@ -1007,11 +989,11 @@ static int snd_ps3_driver_probe(struct ps3_system_bus_device *dev)
|
||||
|
||||
the_card.pcm->info_flags = SNDRV_PCM_INFO_NONINTERLEAVED;
|
||||
/* pre-alloc PCM DMA buffer*/
|
||||
snd_pcm_lib_preallocate_pages_for_all(the_card.pcm,
|
||||
SNDRV_DMA_TYPE_DEV,
|
||||
&dev->core,
|
||||
SND_PS3_PCM_PREALLOC_SIZE,
|
||||
SND_PS3_PCM_PREALLOC_SIZE);
|
||||
snd_pcm_set_managed_buffer_all(the_card.pcm,
|
||||
SNDRV_DMA_TYPE_DEV,
|
||||
&dev->core,
|
||||
SND_PS3_PCM_PREALLOC_SIZE,
|
||||
SND_PS3_PCM_PREALLOC_SIZE);
|
||||
|
||||
/*
|
||||
* allocate null buffer
|
||||
|
Loading…
Reference in New Issue
Block a user