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

ALSA: als300: 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-22-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2019-12-09 10:48:53 +01:00
parent e695745437
commit 909c7d2ccc
1 changed files with 2 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
sound/pci/als300.c
View File

@ -378,7 +378,6 @@ static int snd_als300_playback_close(struct snd_pcm_substream *substream)
data = substream->runtime->private_data; data = substream->runtime->private_data;
kfree(data); kfree(data);
chip->playback_substream = NULL; chip->playback_substream = NULL;
snd_pcm_lib_free_pages(substream);
return 0; return 0;
} }
@ -407,22 +406,9 @@ static int snd_als300_capture_close(struct snd_pcm_substream *substream)
data = substream->runtime->private_data; data = substream->runtime->private_data;
kfree(data); kfree(data);
chip->capture_substream = NULL; chip->capture_substream = NULL;
snd_pcm_lib_free_pages(substream);
return 0; return 0;
} }
static int snd_als300_pcm_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_als300_pcm_hw_free(struct snd_pcm_substream *substream)
{
return snd_pcm_lib_free_pages(substream);
}
static int snd_als300_playback_prepare(struct snd_pcm_substream *substream) static int snd_als300_playback_prepare(struct snd_pcm_substream *substream)
{ {
u32 tmp; u32 tmp;
@ -554,8 +540,6 @@ static const struct snd_pcm_ops snd_als300_playback_ops = {
.open = snd_als300_playback_open, .open = snd_als300_playback_open,
.close = snd_als300_playback_close, .close = snd_als300_playback_close,
.ioctl = snd_pcm_lib_ioctl, .ioctl = snd_pcm_lib_ioctl,
.hw_params = snd_als300_pcm_hw_params,
.hw_free = snd_als300_pcm_hw_free,
.prepare = snd_als300_playback_prepare, .prepare = snd_als300_playback_prepare,
.trigger = snd_als300_trigger, .trigger = snd_als300_trigger,
.pointer = snd_als300_pointer, .pointer = snd_als300_pointer,
@ -565,8 +549,6 @@ static const struct snd_pcm_ops snd_als300_capture_ops = {
.open = snd_als300_capture_open, .open = snd_als300_capture_open,
.close = snd_als300_capture_close, .close = snd_als300_capture_close,
.ioctl = snd_pcm_lib_ioctl, .ioctl = snd_pcm_lib_ioctl,
.hw_params = snd_als300_pcm_hw_params,
.hw_free = snd_als300_pcm_hw_free,
.prepare = snd_als300_capture_prepare, .prepare = snd_als300_capture_prepare,
.trigger = snd_als300_trigger, .trigger = snd_als300_trigger,
.pointer = snd_als300_pointer, .pointer = snd_als300_pointer,
@ -591,9 +573,8 @@ static int snd_als300_new_pcm(struct snd_als300 *chip)
&snd_als300_capture_ops); &snd_als300_capture_ops);
/* pre-allocation of buffers */ /* pre-allocation of buffers */
snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV, snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV, &chip->pci->dev,
&chip->pci->dev, 64*1024, 64*1024);
64*1024, 64*1024);
return 0; return 0;
} }