diff options
| author | David S. Miller <davem@davemloft.net> | 2008-08-28 03:37:58 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-08-29 11:13:12 +0200 |
| commit | 7a715f46012f3552294154978aed59cba9804928 (patch) | |
| tree | 9e7079ae4ad370b63ac6c8a4face573d6cf60533 /sound/core | |
| parent | sparc: Propagate SBUS iommu archdata into real of_device objects. (diff) | |
| download | linux-7a715f46012f3552294154978aed59cba9804928.tar.xz linux-7a715f46012f3552294154978aed59cba9804928.zip | |
sparc: Make SBUS DMA interfaces take struct device.
This is the first step in converting all the SBUS drivers
over to generic dma_*().
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'sound/core')
| -rw-r--r-- | sound/core/memalloc.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sound/core/memalloc.c b/sound/core/memalloc.c index f5d6d8d12979..cc803972c0fb 100644 --- a/sound/core/memalloc.c +++ b/sound/core/memalloc.c @@ -192,7 +192,8 @@ static void *snd_malloc_sbus_pages(struct device *dev, size_t size, snd_assert(size > 0, return NULL); snd_assert(dma_addr != NULL, return NULL); pg = get_order(size); - res = sbus_alloc_consistent(sdev, PAGE_SIZE * (1 << pg), dma_addr); + res = sbus_alloc_consistent(&sdev->ofdev.dev, PAGE_SIZE * (1 << pg), + dma_addr); if (res != NULL) inc_snd_pages(pg); return res; @@ -208,7 +209,8 @@ static void snd_free_sbus_pages(struct device *dev, size_t size, return; pg = get_order(size); dec_snd_pages(pg); - sbus_free_consistent(sdev, PAGE_SIZE * (1 << pg), ptr, dma_addr); + sbus_free_consistent(&sdev->ofdev.dev, PAGE_SIZE * (1 << pg), + ptr, dma_addr); } #endif /* CONFIG_SBUS */ |