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

media: tw686x: 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 dropped.

Cc: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
This commit is contained in:
Takashi Iwai 2019-12-10 14:58:37 +01:00 committed by Mauro Carvalho Chehab
parent a98e2e229d
commit 5e625dd579
1 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/media/pci/tw686x/tw686x-audio.c
View File

@ -78,17 +78,6 @@ void tw686x_audio_irq(struct tw686x_dev *dev, unsigned long requests,
} }
} }
static int tw686x_pcm_hw_params(struct snd_pcm_substream *ss,
struct snd_pcm_hw_params *hw_params)
{
return snd_pcm_lib_malloc_pages(ss, params_buffer_bytes(hw_params));
}
static int tw686x_pcm_hw_free(struct snd_pcm_substream *ss)
{
return snd_pcm_lib_free_pages(ss);
}
/* /*
* Audio parameters are global and shared among all * Audio parameters are global and shared among all
* capture channels. The driver prevents changes to * capture channels. The driver prevents changes to
@ -270,8 +259,6 @@ static const struct snd_pcm_ops tw686x_pcm_ops = {
.open = tw686x_pcm_open, .open = tw686x_pcm_open,
.close = tw686x_pcm_close, .close = tw686x_pcm_close,
.ioctl = snd_pcm_lib_ioctl, .ioctl = snd_pcm_lib_ioctl,
.hw_params = tw686x_pcm_hw_params,
.hw_free = tw686x_pcm_hw_free,
.prepare = tw686x_pcm_prepare, .prepare = tw686x_pcm_prepare,
.trigger = tw686x_pcm_trigger, .trigger = tw686x_pcm_trigger,
.pointer = tw686x_pcm_pointer, .pointer = tw686x_pcm_pointer,
@ -298,7 +285,7 @@ static int tw686x_snd_pcm_init(struct tw686x_dev *dev)
ss; ss = ss->next, i++) ss; ss = ss->next, i++)
snprintf(ss->name, sizeof(ss->name), "vch%u audio", i); snprintf(ss->name, sizeof(ss->name), "vch%u audio", i);
snd_pcm_lib_preallocate_pages_for_all(pcm, snd_pcm_set_managed_buffer_all(pcm,
SNDRV_DMA_TYPE_DEV, SNDRV_DMA_TYPE_DEV,
&dev->pci_dev->dev, &dev->pci_dev->dev,
TW686X_AUDIO_PAGE_MAX * AUDIO_DMA_SIZE_MAX, TW686X_AUDIO_PAGE_MAX * AUDIO_DMA_SIZE_MAX,