adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-29 04:06:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

alsa: Remove special SBUS dma support code.

Browse source 
No longer used.

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2008-08-27 00:33:26 -07:00
parent 12b1c03df1
commit 759ee81be6
4 changed files with 2 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl
View file

@ -5073,8 +5073,7 @@ struct _snd_pcm_runtime {
with <constant>SNDRV_DMA_TYPE_CONTINUOUS</constant> type and the with <constant>SNDRV_DMA_TYPE_CONTINUOUS</constant> type and the
<function>snd_dma_continuous_data(GFP_KERNEL)</function> device pointer, <function>snd_dma_continuous_data(GFP_KERNEL)</function> device pointer,
where <constant>GFP_KERNEL</constant> is the kernel allocation flag to where <constant>GFP_KERNEL</constant> is the kernel allocation flag to
use. For the SBUS, <constant>SNDRV_DMA_TYPE_SBUS</constant> and use.
<function>snd_dma_sbus_data(sbus_dev)</function> are used instead.
For the PCI scatter-gather buffers, use For the PCI scatter-gather buffers, use
<constant>SNDRV_DMA_TYPE_DEV_SG</constant> with <constant>SNDRV_DMA_TYPE_DEV_SG</constant> with
<function>snd_dma_pci_data(pci)</function> <function>snd_dma_pci_data(pci)</function>

3
include/sound/core.h
View file

@ -42,9 +42,6 @@
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
struct pci_dev; struct pci_dev;
#endif #endif
#ifdef CONFIG_SBUS
struct sbus_dev;
#endif
/* device allocation stuff */ /* device allocation stuff */

2
include/sound/memalloc.h
View file

@ -37,7 +37,6 @@ struct snd_dma_device {
#ifndef snd_dma_pci_data #ifndef snd_dma_pci_data
#define snd_dma_pci_data(pci) (&(pci)->dev) #define snd_dma_pci_data(pci) (&(pci)->dev)
#define snd_dma_isa_data() NULL #define snd_dma_isa_data() NULL
#define snd_dma_sbus_data(sbus) ((struct device *)(sbus))
#define snd_dma_continuous_data(x) ((struct device *)(unsigned long)(x)) #define snd_dma_continuous_data(x) ((struct device *)(unsigned long)(x))
#endif #endif
@ -49,7 +48,6 @@ struct snd_dma_device {
#define SNDRV_DMA_TYPE_CONTINUOUS 1 /* continuous no-DMA memory */ #define SNDRV_DMA_TYPE_CONTINUOUS 1 /* continuous no-DMA memory */
#define SNDRV_DMA_TYPE_DEV 2 /* generic device continuous */ #define SNDRV_DMA_TYPE_DEV 2 /* generic device continuous */
#define SNDRV_DMA_TYPE_DEV_SG 3 /* generic device SG-buffer */ #define SNDRV_DMA_TYPE_DEV_SG 3 /* generic device SG-buffer */
#define SNDRV_DMA_TYPE_SBUS 4 /* SBUS continuous */
/* /*
* info for buffer allocation * info for buffer allocation

50
sound/core/memalloc.c
View file

@ -33,9 +33,6 @@
#include <linux/moduleparam.h> #include <linux/moduleparam.h>
#include <linux/mutex.h> #include <linux/mutex.h>
#include <sound/memalloc.h> #include <sound/memalloc.h>
#ifdef CONFIG_SBUS
#include <asm/sbus.h>
#endif
MODULE_AUTHOR("Takashi Iwai <tiwai@suse.de>, Jaroslav Kysela <perex@perex.cz>"); MODULE_AUTHOR("Takashi Iwai <tiwai@suse.de>, Jaroslav Kysela <perex@perex.cz>");
@ -180,41 +177,6 @@ static void snd_free_dev_pages(struct device *dev, size_t size, void *ptr,
} }
#endif /* CONFIG_HAS_DMA */ #endif /* CONFIG_HAS_DMA */
#ifdef CONFIG_SBUS
static void *snd_malloc_sbus_pages(struct device *dev, size_t size,
dma_addr_t *dma_addr)
{
struct sbus_dev *sdev = (struct sbus_dev *)dev;
int pg;
void *res;
snd_assert(size > 0, return NULL);
snd_assert(dma_addr != NULL, return NULL);
pg = get_order(size);
res = dma_alloc_coherent(&sdev->ofdev.dev, PAGE_SIZE * (1 << pg),
dma_addr, GFP_ATOMIC);
if (res != NULL)
inc_snd_pages(pg);
return res;
}
static void snd_free_sbus_pages(struct device *dev, size_t size,
void *ptr, dma_addr_t dma_addr)
{
struct sbus_dev *sdev = (struct sbus_dev *)dev;
int pg;
if (ptr == NULL)
return;
pg = get_order(size);
dec_snd_pages(pg);
dma_free_coherent(&sdev->ofdev.dev, PAGE_SIZE * (1 << pg),
ptr, dma_addr);
}
#endif /* CONFIG_SBUS */
/* /*
* *
* ALSA generic memory management * ALSA generic memory management
@ -249,11 +211,6 @@ int snd_dma_alloc_pages(int type, struct device *device, size_t size,
dmab->area = snd_malloc_pages(size, (unsigned long)device); dmab->area = snd_malloc_pages(size, (unsigned long)device);
dmab->addr = 0; dmab->addr = 0;
break; break;
#ifdef CONFIG_SBUS
case SNDRV_DMA_TYPE_SBUS:
dmab->area = snd_malloc_sbus_pages(device, size, &dmab->addr);
break;
#endif
#ifdef CONFIG_HAS_DMA #ifdef CONFIG_HAS_DMA
case SNDRV_DMA_TYPE_DEV: case SNDRV_DMA_TYPE_DEV:
dmab->area = snd_malloc_dev_pages(device, size, &dmab->addr); dmab->area = snd_malloc_dev_pages(device, size, &dmab->addr);
@ -322,11 +279,6 @@ void snd_dma_free_pages(struct snd_dma_buffer *dmab)
case SNDRV_DMA_TYPE_CONTINUOUS: case SNDRV_DMA_TYPE_CONTINUOUS:
snd_free_pages(dmab->area, dmab->bytes); snd_free_pages(dmab->area, dmab->bytes);
break; break;
#ifdef CONFIG_SBUS
case SNDRV_DMA_TYPE_SBUS:
snd_free_sbus_pages(dmab->dev.dev, dmab->bytes, dmab->area, dmab->addr);
break;
#endif
#ifdef CONFIG_HAS_DMA #ifdef CONFIG_HAS_DMA
case SNDRV_DMA_TYPE_DEV: case SNDRV_DMA_TYPE_DEV:
snd_free_dev_pages(dmab->dev.dev, dmab->bytes, dmab->area, dmab->addr); snd_free_dev_pages(dmab->dev.dev, dmab->bytes, dmab->area, dmab->addr);
@ -433,7 +385,7 @@ static int snd_mem_proc_read(struct seq_file *seq, void *offset)
long pages = snd_allocated_pages >> (PAGE_SHIFT-12); long pages = snd_allocated_pages >> (PAGE_SHIFT-12);
struct snd_mem_list *mem; struct snd_mem_list *mem;
int devno; int devno;
static char *types[] = { "UNKNOWN", "CONT", "DEV", "DEV-SG", "SBUS" }; static char *types[] = { "UNKNOWN", "CONT", "DEV", "DEV-SG" };
mutex_lock(&list_mutex); mutex_lock(&list_mutex);
seq_printf(seq, "pages : %li bytes (%li pages per %likB)\n", seq_printf(seq, "pages : %li bytes (%li pages per %likB)\n",