TWxSoftware/twx-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ALSA: ad1816a: 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.

Link: https://lore.kernel.org/r/20191209094943.14984-11-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai
2019-12-09 10:48:42 +01:00
parent 7641d549b1
commit d577b6c8cf
1 changed files with 2 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sound/isa/ad1816a/ad1816a_lib.c
+2 -18
View File
@@ -206,17 +206,6 @@ static int snd_ad1816a_capture_trigger(struct snd_pcm_substream *substream, int
SNDRV_PCM_STREAM_CAPTURE, cmd, 1); SNDRV_PCM_STREAM_CAPTURE, cmd, 1);
} }
static int snd_ad1816a_hw_params(struct snd_pcm_substream *substream,
struct snd_pcm_hw_params *hw_params)
{
return snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params));
}
static int snd_ad1816a_hw_free(struct snd_pcm_substream *substream)
{
return snd_pcm_lib_free_pages(substream);
}
static int snd_ad1816a_playback_prepare(struct snd_pcm_substream *substream) static int snd_ad1816a_playback_prepare(struct snd_pcm_substream *substream)
{ {
struct snd_ad1816a *chip = snd_pcm_substream_chip(substream); struct snd_ad1816a *chip = snd_pcm_substream_chip(substream);
@@ -645,8 +634,6 @@ static const struct snd_pcm_ops snd_ad1816a_playback_ops = {
.open = snd_ad1816a_playback_open, .open = snd_ad1816a_playback_open,
.close = snd_ad1816a_playback_close, .close = snd_ad1816a_playback_close,
.ioctl = snd_pcm_lib_ioctl, .ioctl = snd_pcm_lib_ioctl,
.hw_params = snd_ad1816a_hw_params,
.hw_free = snd_ad1816a_hw_free,
.prepare = snd_ad1816a_playback_prepare, .prepare = snd_ad1816a_playback_prepare,
.trigger = snd_ad1816a_playback_trigger, .trigger = snd_ad1816a_playback_trigger,
.pointer = snd_ad1816a_playback_pointer, .pointer = snd_ad1816a_playback_pointer,
@@ -656,8 +643,6 @@ static const struct snd_pcm_ops snd_ad1816a_capture_ops = {
.open = snd_ad1816a_capture_open, .open = snd_ad1816a_capture_open,
.close = snd_ad1816a_capture_close, .close = snd_ad1816a_capture_close,
.ioctl = snd_pcm_lib_ioctl, .ioctl = snd_pcm_lib_ioctl,
.hw_params = snd_ad1816a_hw_params,
.hw_free = snd_ad1816a_hw_free,
.prepare = snd_ad1816a_capture_prepare, .prepare = snd_ad1816a_capture_prepare,
.trigger = snd_ad1816a_capture_trigger, .trigger = snd_ad1816a_capture_trigger,
.pointer = snd_ad1816a_capture_pointer, .pointer = snd_ad1816a_capture_pointer,
@@ -680,9 +665,8 @@ int snd_ad1816a_pcm(struct snd_ad1816a *chip, int device)
strcpy(pcm->name, snd_ad1816a_chip_id(chip)); strcpy(pcm->name, snd_ad1816a_chip_id(chip));
snd_ad1816a_init(chip); snd_ad1816a_init(chip);
snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV, snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV, chip->card->dev,
chip->card->dev, 64*1024, chip->dma1 > 3 || chip->dma2 > 3 ? 128*1024 : 64*1024);
64*1024, chip->dma1 > 3 || chip->dma2 > 3 ? 128*1024 : 64*1024);
chip->pcm = pcm; chip->pcm = pcm;
return 0; return 0;