aboutsummaryrefslogtreecommitdiffstats
path: root/arch/blackfin
diff options
context:
space:
mode:
authorAubrey Li <aubrey.li@analog.com>2007-06-11 03:31:30 -0400
committerBryan Wu <bryan.wu@analog.com>2007-06-11 03:31:30 -0400
commitac1bd53c067397947b5d805c631519282f5678fe (patch)
treeee468cc6591b3bbae575b91a47491314dd05d009 /arch/blackfin
parentdb94d9d24526f83c432f0e5620078f02f7ae76ca (diff)
Blackfin arch: DMA code minor naming convention fix
Signed-off-by: Aubrey Li <aubrey.li@analog.com> Signed-off-by: Bryan Wu <bryan.wu@analog.com> Cc: Pekka Enberg <penberg@cs.helsinki.fi>
Diffstat (limited to 'arch/blackfin')
-rw-r--r--arch/blackfin/kernel/bfin_dma_5xx.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/blackfin/kernel/bfin_dma_5xx.c b/arch/blackfin/kernel/bfin_dma_5xx.c
index 0ccb0dc3f833..069a896a8f26 100644
--- a/arch/blackfin/kernel/bfin_dma_5xx.c
+++ b/arch/blackfin/kernel/bfin_dma_5xx.c
@@ -595,7 +595,7 @@ unsigned short get_dma_curr_ycount(unsigned int channel)
595} 595}
596EXPORT_SYMBOL(get_dma_curr_ycount); 596EXPORT_SYMBOL(get_dma_curr_ycount);
597 597
598void *_dma_memcpy(void *dest, const void *src, size_t size) 598static void *__dma_memcpy(void *dest, const void *src, size_t size)
599{ 599{
600 int direction; /* 1 - address decrease, 0 - address increase */ 600 int direction; /* 1 - address decrease, 0 - address increase */
601 int flag_align; /* 1 - address aligned, 0 - address unaligned */ 601 int flag_align; /* 1 - address aligned, 0 - address unaligned */
@@ -744,8 +744,8 @@ void *dma_memcpy(void *dest, const void *src, size_t size)
744 bulk = (size >> 16) << 16; 744 bulk = (size >> 16) << 16;
745 rest = size - bulk; 745 rest = size - bulk;
746 if (bulk) 746 if (bulk)
747 _dma_memcpy(dest, src, bulk); 747 __dma_memcpy(dest, src, bulk);
748 addr = _dma_memcpy(dest+bulk, src+bulk, rest); 748 addr = __dma_memcpy(dest+bulk, src+bulk, rest);
749 return addr; 749 return addr;
750} 750}
751 751