diff options
author | David S. Miller <davem@davemloft.net> | 2008-08-27 21:09:11 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-08-29 05:13:15 -0400 |
commit | 738f2b7b813913e651f39387d007dd961755dee2 (patch) | |
tree | 022ca4d144cba51495e6f26a8f55d3046d16c2e3 /sound/core | |
parent | 944c67dff7a88f0a775e5b604937f9e30d2de555 (diff) |
sparc: Convert all SBUS drivers to dma_*() interfaces.
And all the SBUS dma interfaces are deleted.
A private implementation remains inside of the 32-bit sparc port which
exists only for the sake of the implementation of dma_*().
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'sound/core')
-rw-r--r-- | sound/core/memalloc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/core/memalloc.c b/sound/core/memalloc.c index cc803972c0f..ccaaac45faf 100644 --- a/sound/core/memalloc.c +++ b/sound/core/memalloc.c | |||
@@ -192,8 +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->ofdev.dev, PAGE_SIZE * (1 << pg), | 195 | res = dma_alloc_coherent(&sdev->ofdev.dev, PAGE_SIZE * (1 << pg), |
196 | dma_addr); | 196 | dma_addr, GFP_ATOMIC); |
197 | if (res != NULL) | 197 | if (res != NULL) |
198 | inc_snd_pages(pg); | 198 | inc_snd_pages(pg); |
199 | return res; | 199 | return res; |
@@ -209,8 +209,8 @@ static void snd_free_sbus_pages(struct device *dev, size_t size, | |||
209 | return; | 209 | return; |
210 | pg = get_order(size); | 210 | pg = get_order(size); |
211 | dec_snd_pages(pg); | 211 | dec_snd_pages(pg); |
212 | sbus_free_consistent(&sdev->ofdev.dev, PAGE_SIZE * (1 << pg), | 212 | dma_free_coherent(&sdev->ofdev.dev, PAGE_SIZE * (1 << pg), |
213 | ptr, dma_addr); | 213 | ptr, dma_addr); |
214 | } | 214 | } |
215 | 215 | ||
216 | #endif /* CONFIG_SBUS */ | 216 | #endif /* CONFIG_SBUS */ |