Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-15 00:21:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

ASoC: uniphier: Use managed buffer allocation

Browse Source 
Clean up the driver with the new managed buffer allocation API.
The hw_params and hw_free callbacks became superfluous and got
dropped, as well as the pcm_destruct callback just containing the
superfluous snd_pcm_lib_preallocate_free_for_all() call.

Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Link: https://lore.kernel.org/r/20191210142614.19405-15-tiwai@suse.de
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Takashi Iwai 2019-12-10 15:26:05 +01:00 committed by Mark Brown
parent 2c7c9630db
commit d55894bc27
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 1 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
sound/soc/uniphier/aio-dma.c
View File

@ -104,25 +104,6 @@ static int uniphier_aiodma_open(struct snd_soc_component *component,
SNDRV_PCM_HW_PARAM_BUFFER_BYTES, 256); SNDRV_PCM_HW_PARAM_BUFFER_BYTES, 256);
} }
static int uniphier_aiodma_hw_params(struct snd_soc_component *component,
struct snd_pcm_substream *substream,
struct snd_pcm_hw_params *params)
{
snd_pcm_set_runtime_buffer(substream, &substream->dma_buffer);
substream->runtime->dma_bytes = params_buffer_bytes(params);
return 0;
}
static int uniphier_aiodma_hw_free(struct snd_soc_component *component,
struct snd_pcm_substream *substream)
{
snd_pcm_set_runtime_buffer(substream, NULL);
substream->runtime->dma_bytes = 0;
return 0;
}
static int uniphier_aiodma_prepare(struct snd_soc_component *component, static int uniphier_aiodma_prepare(struct snd_soc_component *component,
struct snd_pcm_substream *substream) struct snd_pcm_substream *substream)
{ {
@ -232,30 +213,21 @@ static int uniphier_aiodma_new(struct snd_soc_component *component,
if (ret) if (ret)
return ret; return ret;
snd_pcm_lib_preallocate_pages_for_all(pcm, snd_pcm_set_managed_buffer_all(pcm,
SNDRV_DMA_TYPE_DEV, dev, SNDRV_DMA_TYPE_DEV, dev,
uniphier_aiodma_hw.buffer_bytes_max, uniphier_aiodma_hw.buffer_bytes_max,
uniphier_aiodma_hw.buffer_bytes_max); uniphier_aiodma_hw.buffer_bytes_max);
return 0; return 0;
} }
static void uniphier_aiodma_free(struct snd_soc_component *component,
struct snd_pcm *pcm)
{
snd_pcm_lib_preallocate_free_for_all(pcm);
}
static const struct snd_soc_component_driver uniphier_soc_platform = { static const struct snd_soc_component_driver uniphier_soc_platform = {
.open = uniphier_aiodma_open, .open = uniphier_aiodma_open,
.ioctl = snd_soc_pcm_lib_ioctl, .ioctl = snd_soc_pcm_lib_ioctl,
.hw_params = uniphier_aiodma_hw_params,
.hw_free = uniphier_aiodma_hw_free,
.prepare = uniphier_aiodma_prepare, .prepare = uniphier_aiodma_prepare,
.trigger = uniphier_aiodma_trigger, .trigger = uniphier_aiodma_trigger,
.pointer = uniphier_aiodma_pointer, .pointer = uniphier_aiodma_pointer,
.mmap = uniphier_aiodma_mmap, .mmap = uniphier_aiodma_mmap,
.pcm_construct = uniphier_aiodma_new, .pcm_construct = uniphier_aiodma_new,
.pcm_destruct = uniphier_aiodma_free,
.compr_ops = &uniphier_aio_compr_ops, .compr_ops = &uniphier_aio_compr_ops,
}; };