Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=b7b2d344e7f7027497547a8b786a407047ee5e26
Commit:     b7b2d344e7f7027497547a8b786a407047ee5e26
Parent:     c11b5776bfef671cd6eea4479f345ec042638643
Author:     Bryan Wu <[EMAIL PROTECTED]>
AuthorDate: Tue Oct 9 15:09:49 2007 +0800
Committer:  Bryan Wu <[EMAIL PROTECTED]>
CommitDate: Tue Oct 9 15:09:49 2007 +0800

    Blackfin arch: modify the insX/outsX and dma_insX/dma_outsX to be 
compatible with other archs
    
    Signed-off-by: Bryan Wu <[EMAIL PROTECTED]>
---
 arch/blackfin/kernel/bfin_dma_5xx.c |   12 ++++++------
 include/asm-blackfin/io.h           |   24 ++++++++++++------------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/arch/blackfin/kernel/bfin_dma_5xx.c 
b/arch/blackfin/kernel/bfin_dma_5xx.c
index 858cca6..17edd65 100644
--- a/arch/blackfin/kernel/bfin_dma_5xx.c
+++ b/arch/blackfin/kernel/bfin_dma_5xx.c
@@ -583,7 +583,7 @@ void *safe_dma_memcpy(void *dest, const void *src, size_t 
size)
 }
 EXPORT_SYMBOL(safe_dma_memcpy);
 
-void dma_outsb(const void __iomem *addr, const void *buf, unsigned short len)
+void dma_outsb(unsigned long addr, const void *buf, unsigned short len)
 {
        unsigned long flags;
 
@@ -616,7 +616,7 @@ void dma_outsb(const void __iomem *addr, const void *buf, 
unsigned short len)
 EXPORT_SYMBOL(dma_outsb);
 
 
-void dma_insb(const void __iomem *addr, void *buf, unsigned short len)
+void dma_insb(unsigned long addr, void *buf, unsigned short len)
 {
        unsigned long flags;
 
@@ -647,7 +647,7 @@ void dma_insb(const void __iomem *addr, void *buf, unsigned 
short len)
 }
 EXPORT_SYMBOL(dma_insb);
 
-void dma_outsw(const void __iomem *addr, const void  *buf, unsigned short len)
+void dma_outsw(unsigned long addr, const void  *buf, unsigned short len)
 {
        unsigned long flags;
 
@@ -679,7 +679,7 @@ void dma_outsw(const void __iomem *addr, const void  *buf, 
unsigned short len)
 }
 EXPORT_SYMBOL(dma_outsw);
 
-void dma_insw(const void __iomem *addr, void *buf, unsigned short len)
+void dma_insw(unsigned long addr, void *buf, unsigned short len)
 {
        unsigned long flags;
 
@@ -711,7 +711,7 @@ void dma_insw(const void __iomem *addr, void *buf, unsigned 
short len)
 }
 EXPORT_SYMBOL(dma_insw);
 
-void dma_outsl(const void __iomem *addr, const void *buf, unsigned short len)
+void dma_outsl(unsigned long addr, const void *buf, unsigned short len)
 {
        unsigned long flags;
 
@@ -743,7 +743,7 @@ void dma_outsl(const void __iomem *addr, const void *buf, 
unsigned short len)
 }
 EXPORT_SYMBOL(dma_outsl);
 
-void dma_insl(const void __iomem *addr, void *buf, unsigned short len)
+void dma_insl(unsigned long addr, void *buf, unsigned short len)
 {
        unsigned long flags;
 
diff --git a/include/asm-blackfin/io.h b/include/asm-blackfin/io.h
index 3f48f8f..525179b 100644
--- a/include/asm-blackfin/io.h
+++ b/include/asm-blackfin/io.h
@@ -115,21 +115,21 @@ static inline unsigned int readl(const volatile void 
__iomem *addr)
 
 #ifndef __ASSEMBLY__
 
-extern void outsb(const void __iomem *port, const void *addr, unsigned short 
count);
-extern void outsw(const void __iomem *port, const void *addr, unsigned short 
count);
-extern void outsl(const void __iomem *port, const void *addr, unsigned short 
count);
+extern void outsb(unsigned long port, const void *addr, unsigned long count);
+extern void outsw(unsigned long port, const void *addr, unsigned long count);
+extern void outsl(unsigned long port, const void *addr, unsigned long count);
 
-extern void insb(const void __iomem *port, void *addr, unsigned short count);
-extern void insw(const void __iomem *port, void *addr, unsigned short count);
-extern void insl(const void __iomem *port, void *addr, unsigned short count);
+extern void insb(unsigned long port, void *addr, unsigned long count);
+extern void insw(unsigned long port, void *addr, unsigned long count);
+extern void insl(unsigned long port, void *addr, unsigned long count);
 
-extern void dma_outsb(const void __iomem *port, const void *addr, unsigned 
short count);
-extern void dma_outsw(const void __iomem *port, const void *addr, unsigned 
short count);
-extern void dma_outsl(const void __iomem *port, const void *addr, unsigned 
short count);
+extern void dma_outsb(unsigned long port, const void *addr, unsigned short 
count);
+extern void dma_outsw(unsigned long port, const void *addr, unsigned short 
count);
+extern void dma_outsl(unsigned long port, const void *addr, unsigned short 
count);
 
-extern void dma_insb(const void __iomem *port, void *addr, unsigned short 
count);
-extern void dma_insw(const void __iomem *port, void *addr, unsigned short 
count);
-extern void dma_insl(const void __iomem *port, void *addr, unsigned short 
count);
+extern void dma_insb(unsigned long port, void *addr, unsigned short count);
+extern void dma_insw(unsigned long port, void *addr, unsigned short count);
+extern void dma_insl(unsigned long port, void *addr, unsigned short count);
 
 /*
  * Map some physical address range into the kernel address space.
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to