Title: [8924] trunk/arch/blackfin/kernel/bfin_dma_5xx.c: dma_memcpy() tail into dma_memcpy_nocache() to avoid duplication
- Revision
- 8924
- Author
- hennerich
- Date
- 2010-06-17 04:16:50 -0400 (Thu, 17 Jun 2010)
Log Message
dma_memcpy() tail into dma_memcpy_nocache() to avoid duplication
Modified Paths
Diff
Modified: trunk/arch/blackfin/kernel/bfin_dma_5xx.c (8923 => 8924)
--- trunk/arch/blackfin/kernel/bfin_dma_5xx.c 2010-06-17 07:56:21 UTC (rev 8923)
+++ trunk/arch/blackfin/kernel/bfin_dma_5xx.c 2010-06-17 08:16:50 UTC (rev 8924)
@@ -450,7 +450,6 @@
{
unsigned long dst = (unsigned long)pdst;
unsigned long src = "" long)psrc;
- size_t bulk, rest;
if (bfin_addr_dcacheable(src))
blackfin_dcache_flush_range(src, src + size);
@@ -458,12 +457,7 @@
if (bfin_addr_dcacheable(dst))
blackfin_dcache_invalidate_range(dst, dst + size);
- bulk = size & ~0xffff;
- rest = size - bulk;
- if (bulk)
- _dma_memcpy(pdst, psrc, bulk);
- _dma_memcpy(pdst + bulk, psrc + bulk, rest);
- return pdst;
+ return dma_memcpy_nocache(pdst, psrc, size);
}
EXPORT_SYMBOL(dma_memcpy);
@@ -477,8 +471,6 @@
*/
void *dma_memcpy_nocache(void *pdst, const void *psrc, size_t size)
{
- unsigned long dst = (unsigned long)pdst;
- unsigned long src = "" long)psrc;
size_t bulk, rest;
bulk = size & ~0xffff;
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
