Merge tag 'asoc-v3.10-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: More updates for v3.10 The main additional change here is Lars-Peter's DMA work plus the platform conversions which have been tested - getting this in mainline will make life easier for development after the merge window. These factor a large chunk of code out of the drivers for the platforms using dmaengine, greatly simplifying development.
This commit is contained in:
@@ -64,7 +64,8 @@ static int spear_pcm_open(struct snd_pcm_substream *substream)
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
return snd_dmaengine_pcm_open(substream, dma_data->filter, dma_data)
|
||||
return snd_dmaengine_pcm_open_request_chan(substream, dma_data->filter,
|
||||
dma_data);
|
||||
}
|
||||
|
||||
static int spear_pcm_mmap(struct snd_pcm_substream *substream,
|
||||
@@ -79,7 +80,7 @@ static int spear_pcm_mmap(struct snd_pcm_substream *substream,
|
||||
|
||||
static struct snd_pcm_ops spear_pcm_ops = {
|
||||
.open = spear_pcm_open,
|
||||
.close = snd_dmaengine_pcm_close,
|
||||
.close = snd_dmaengine_pcm_close_release_chan,
|
||||
.ioctl = snd_pcm_lib_ioctl,
|
||||
.hw_params = spear_pcm_hw_params,
|
||||
.hw_free = spear_pcm_hw_free,
|
||||
|
Reference in New Issue
Block a user