git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
include
/
asm-arm
/
arch-ixp4xx
/
io.h
diff --git
a/include/asm-arm/arch-ixp4xx/io.h
b/include/asm-arm/arch-ixp4xx/io.h
index
5400ab0
..
c27b9d3
100644
(file)
--- a/
include/asm-arm/arch-ixp4xx/io.h
+++ b/
include/asm-arm/arch-ixp4xx/io.h
@@
-46,7
+46,7
@@
extern int ixp4xx_pci_write(u32 addr, u32 cmd, u32 data);
*/
#ifndef CONFIG_IXP4XX_INDIRECT_PCI
*/
#ifndef CONFIG_IXP4XX_INDIRECT_PCI
-#define __mem_pci(a) (
(unsigned long)(a)
)
+#define __mem_pci(a) (
a
)
#else
#else
@@
-58,10
+58,10
@@
extern int ixp4xx_pci_write(u32 addr, u32 cmd, u32 data);
* access registers. If something outside of PCI is ioremap'd, we
* fallback to the default.
*/
* access registers. If something outside of PCI is ioremap'd, we
* fallback to the default.
*/
-static inline void *
+static inline void
__iomem
*
__ixp4xx_ioremap(unsigned long addr, size_t size, unsigned long flags, unsigned long align)
{
__ixp4xx_ioremap(unsigned long addr, size_t size, unsigned long flags, unsigned long align)
{
- extern void * __ioremap(unsigned long, size_t, unsigned long, unsigned long);
+ extern void
__iomem
* __ioremap(unsigned long, size_t, unsigned long, unsigned long);
if((addr < 0x48000000) || (addr > 0x4fffffff))
return __ioremap(addr, size, flags, align);
if((addr < 0x48000000) || (addr > 0x4fffffff))
return __ioremap(addr, size, flags, align);
@@
-69,9
+69,9
@@
__ixp4xx_ioremap(unsigned long addr, size_t size, unsigned long flags, unsigned
}
static inline void
}
static inline void
-__ixp4xx_iounmap(void *addr)
+__ixp4xx_iounmap(void
__iomem
*addr)
{
{
- extern void __iounmap(void *addr);
+ extern void __iounmap(void
__iomem
*addr);
if ((u32)addr >= VMALLOC_START)
__iounmap(addr);
if ((u32)addr >= VMALLOC_START)
__iounmap(addr);
@@
-292,7
+292,7
@@
__ixp4xx_outb(u8 value, u32 addr)
}
static inline void
}
static inline void
-__ixp4xx_outsb(u32 io_addr, u8 *vaddr, u32 count)
+__ixp4xx_outsb(u32 io_addr,
const
u8 *vaddr, u32 count)
{
while (count--)
outb(*vaddr++, io_addr);
{
while (count--)
outb(*vaddr++, io_addr);
@@
-309,7
+309,7
@@
__ixp4xx_outw(u16 value, u32 addr)
}
static inline void
}
static inline void
-__ixp4xx_outsw(u32 io_addr, u16 *vaddr, u32 count)
+__ixp4xx_outsw(u32 io_addr,
const
u16 *vaddr, u32 count)
{
while (count--)
outw(cpu_to_le16(*vaddr++), io_addr);
{
while (count--)
outw(cpu_to_le16(*vaddr++), io_addr);
@@
-322,7
+322,7
@@
__ixp4xx_outl(u32 value, u32 addr)
}
static inline void
}
static inline void
-__ixp4xx_outsl(u32 io_addr, u32 *vaddr, u32 count)
+__ixp4xx_outsl(u32 io_addr,
const
u32 *vaddr, u32 count)
{
while (count--)
outl(*vaddr++, io_addr);
{
while (count--)
outl(*vaddr++, io_addr);