Commit d6797322 authored by Takashi Iwai's avatar Takashi Iwai

ALSA: Remove old DMA-mmap code from arm/devdma.c

The call of dma_mmap_coherent() is done in the PCM core now.
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 6985c887
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
# #
obj-$(CONFIG_SND_ARMAACI) += snd-aaci.o obj-$(CONFIG_SND_ARMAACI) += snd-aaci.o
snd-aaci-objs := aaci.o devdma.o snd-aaci-objs := aaci.o
obj-$(CONFIG_SND_PXA2XX_PCM) += snd-pxa2xx-pcm.o obj-$(CONFIG_SND_PXA2XX_PCM) += snd-pxa2xx-pcm.o
snd-pxa2xx-pcm-objs := pxa2xx-pcm.o snd-pxa2xx-pcm-objs := pxa2xx-pcm.o
......
...@@ -30,7 +30,6 @@ ...@@ -30,7 +30,6 @@
#include <sound/pcm_params.h> #include <sound/pcm_params.h>
#include "aaci.h" #include "aaci.h"
#include "devdma.h"
#define DRIVER_NAME "aaci-pl041" #define DRIVER_NAME "aaci-pl041"
...@@ -492,7 +491,7 @@ static int aaci_pcm_hw_free(struct snd_pcm_substream *substream) ...@@ -492,7 +491,7 @@ static int aaci_pcm_hw_free(struct snd_pcm_substream *substream)
/* /*
* Clear out the DMA and any allocated buffers. * Clear out the DMA and any allocated buffers.
*/ */
devdma_hw_free(NULL, substream); snd_pcm_lib_free_pages(substream);
return 0; return 0;
} }
...@@ -505,7 +504,7 @@ static int aaci_pcm_hw_params(struct snd_pcm_substream *substream, ...@@ -505,7 +504,7 @@ static int aaci_pcm_hw_params(struct snd_pcm_substream *substream,
aaci_pcm_hw_free(substream); aaci_pcm_hw_free(substream);
err = devdma_hw_alloc(NULL, substream, err = snd_pcm_lib_malloc_pages(substream,
params_buffer_bytes(params)); params_buffer_bytes(params));
if (err < 0) if (err < 0)
goto out; goto out;
...@@ -551,11 +550,6 @@ static snd_pcm_uframes_t aaci_pcm_pointer(struct snd_pcm_substream *substream) ...@@ -551,11 +550,6 @@ static snd_pcm_uframes_t aaci_pcm_pointer(struct snd_pcm_substream *substream)
return bytes_to_frames(runtime, bytes); return bytes_to_frames(runtime, bytes);
} }
static int aaci_pcm_mmap(struct snd_pcm_substream *substream, struct vm_area_struct *vma)
{
return devdma_mmap(NULL, substream, vma);
}
/* /*
* Playback specific ALSA stuff * Playback specific ALSA stuff
...@@ -722,7 +716,6 @@ static struct snd_pcm_ops aaci_playback_ops = { ...@@ -722,7 +716,6 @@ static struct snd_pcm_ops aaci_playback_ops = {
.prepare = aaci_pcm_prepare, .prepare = aaci_pcm_prepare,
.trigger = aaci_pcm_playback_trigger, .trigger = aaci_pcm_playback_trigger,
.pointer = aaci_pcm_pointer, .pointer = aaci_pcm_pointer,
.mmap = aaci_pcm_mmap,
}; };
static int aaci_pcm_capture_hw_params(struct snd_pcm_substream *substream, static int aaci_pcm_capture_hw_params(struct snd_pcm_substream *substream,
...@@ -850,7 +843,6 @@ static struct snd_pcm_ops aaci_capture_ops = { ...@@ -850,7 +843,6 @@ static struct snd_pcm_ops aaci_capture_ops = {
.prepare = aaci_pcm_capture_prepare, .prepare = aaci_pcm_capture_prepare,
.trigger = aaci_pcm_capture_trigger, .trigger = aaci_pcm_capture_trigger,
.pointer = aaci_pcm_pointer, .pointer = aaci_pcm_pointer,
.mmap = aaci_pcm_mmap,
}; };
/* /*
...@@ -1040,6 +1032,8 @@ static int __devinit aaci_init_pcm(struct aaci *aaci) ...@@ -1040,6 +1032,8 @@ static int __devinit aaci_init_pcm(struct aaci *aaci)
snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &aaci_playback_ops); snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &aaci_playback_ops);
snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &aaci_capture_ops); snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &aaci_capture_ops);
snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,
NULL, 0, 64 * 104);
} }
return ret; return ret;
......
/*
* linux/sound/arm/devdma.c
*
* Copyright (C) 2003-2004 Russell King, All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*
* ARM DMA shim for ALSA.
*/
#include <linux/device.h>
#include <linux/dma-mapping.h>
#include <sound/core.h>
#include <sound/pcm.h>
#include "devdma.h"
void devdma_hw_free(struct device *dev, struct snd_pcm_substream *substream)
{
struct snd_pcm_runtime *runtime = substream->runtime;
struct snd_dma_buffer *buf = runtime->dma_buffer_p;
if (runtime->dma_area == NULL)
return;
if (buf != &substream->dma_buffer) {
dma_free_coherent(buf->dev.dev, buf->bytes, buf->area, buf->addr);
kfree(runtime->dma_buffer_p);
}
snd_pcm_set_runtime_buffer(substream, NULL);
}
int devdma_hw_alloc(struct device *dev, struct snd_pcm_substream *substream, size_t size)
{
struct snd_pcm_runtime *runtime = substream->runtime;
struct snd_dma_buffer *buf = runtime->dma_buffer_p;
int ret = 0;
if (buf) {
if (buf->bytes >= size)
goto out;
devdma_hw_free(dev, substream);
}
if (substream->dma_buffer.area != NULL && substream->dma_buffer.bytes >= size) {
buf = &substream->dma_buffer;
} else {
buf = kmalloc(sizeof(struct snd_dma_buffer), GFP_KERNEL);
if (!buf)
goto nomem;
buf->dev.type = SNDRV_DMA_TYPE_DEV;
buf->dev.dev = dev;
buf->area = dma_alloc_coherent(dev, size, &buf->addr, GFP_KERNEL);
buf->bytes = size;
buf->private_data = NULL;
if (!buf->area)
goto free;
}
snd_pcm_set_runtime_buffer(substream, buf);
ret = 1;
out:
runtime->dma_bytes = size;
return ret;
free:
kfree(buf);
nomem:
return -ENOMEM;
}
int devdma_mmap(struct device *dev, struct snd_pcm_substream *substream, struct vm_area_struct *vma)
{
struct snd_pcm_runtime *runtime = substream->runtime;
return dma_mmap_coherent(dev, vma, runtime->dma_area, runtime->dma_addr, runtime->dma_bytes);
}
void devdma_hw_free(struct device *dev, struct snd_pcm_substream *substream);
int devdma_hw_alloc(struct device *dev, struct snd_pcm_substream *substream, size_t size);
int devdma_mmap(struct device *dev, struct snd_pcm_substream *substream, struct vm_area_struct *vma);
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment