commit 333c9624b728a9e83b741ea75836aa114ec35272
author Russell King <rmk@dyn-67.arm.linux.org.uk> Wed Jan 04 14:41:29 2006 +0000
committer Russell King <rmk+kernel@arm.linux.org.uk> Wed Jan 04 14:41:29 2006 +0000
tree 607fa3d2d2aa3d2cc3e4c4ebacdf8e7d7b59c565
parent 109a9378807cb9093a88fbf9707420de97601e14

[ARM] Move ISA DMA bus_to_virt() out of set_dma_addr()

Allow the compiler to optimise the bus_to_virt(virt_to_bus())
transformation in the ARM ISA DMA interface.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

arch/arm/kernel/dma.c

diff --git a/arch/arm/kernel/dma.c b/arch/arm/kernel/dma.c
index 8d6381c..3aedada 100644
--- a/arch/arm/kernel/dma.c
+++ b/arch/arm/kernel/dma.c
@@ -131,7 +131,7 @@
  *
  * Copy address to the structure, and set the invalid bit
  */
-void set_dma_addr (dmach_t channel, unsigned long physaddr)
+void __set_dma_addr (dmach_t channel, void *addr)
 {
 	dma_t *dma = dma_chan + channel;
 
@@ -141,7 +141,7 @@
 
 	dma->sg = &dma->buf;
 	dma->sgcount = 1;
-	dma->buf.__address = bus_to_virt(physaddr);
+	dma->buf.__address = addr;
 	dma->using_sg = 0;
 	dma->invalid = 1;
 }
@@ -278,7 +278,7 @@
 GLOBAL_ALIAS(set_dma_mode, get_dma_residue);
 GLOBAL_ALIAS(set_dma_page, get_dma_residue);
 GLOBAL_ALIAS(set_dma_count, get_dma_residue);
-GLOBAL_ALIAS(set_dma_addr, get_dma_residue);
+GLOBAL_ALIAS(__set_dma_addr, get_dma_residue);
 GLOBAL_ALIAS(set_dma_sg, get_dma_residue);
 GLOBAL_ALIAS(set_dma_speed, get_dma_residue);
 GLOBAL_ALIAS(init_dma, get_dma_residue);
@@ -289,7 +289,7 @@
 EXPORT_SYMBOL(free_dma);
 EXPORT_SYMBOL(enable_dma);
 EXPORT_SYMBOL(disable_dma);
-EXPORT_SYMBOL(set_dma_addr);
+EXPORT_SYMBOL(__set_dma_addr);
 EXPORT_SYMBOL(set_dma_count);
 EXPORT_SYMBOL(set_dma_mode);
 EXPORT_SYMBOL(set_dma_page);