diff options
author | David S. Miller <davem@davemloft.net> | 2008-08-27 21:37:58 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-08-29 05:13:12 -0400 |
commit | 7a715f46012f3552294154978aed59cba9804928 (patch) | |
tree | 9e7079ae4ad370b63ac6c8a4face573d6cf60533 /sound/core | |
parent | 5778002874de0fb7e3d8c4a0a4afb6b1a6297069 (diff) |
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, | |||
192 | snd_assert(size > 0, return NULL); | 192 | snd_assert(size > 0, return NULL); |
193 | snd_assert(dma_addr != NULL, return NULL); | 193 | snd_assert(dma_addr != NULL, return NULL); |
194 | pg = get_order(size); | 194 | pg = get_order(size); |
195 | res = sbus_alloc_consistent(sdev, PAGE_SIZE * (1 << pg), dma_addr); | 195 | res = sbus_alloc_consistent(&sdev->ofdev.dev, PAGE_SIZE * (1 << pg), |
196 | dma_addr); | ||
196 | if (res != NULL) | 197 | if (res != NULL) |
197 | inc_snd_pages(pg); | 198 | inc_snd_pages(pg); |
198 | return res; | 199 | return res; |
@@ -208,7 +209,8 @@ static void snd_free_sbus_pages(struct device *dev, size_t size, | |||
208 | return; | 209 | return; |
209 | pg = get_order(size); | 210 | pg = get_order(size); |
210 | dec_snd_pages(pg); | 211 | dec_snd_pages(pg); |
211 | sbus_free_consistent(sdev, PAGE_SIZE * (1 << pg), ptr, dma_addr); | 212 | sbus_free_consistent(&sdev->ofdev.dev, PAGE_SIZE * (1 << pg), |
213 | ptr, dma_addr); | ||
212 | } | 214 | } |
213 | 215 | ||
214 | #endif /* CONFIG_SBUS */ | 216 | #endif /* CONFIG_SBUS */ |