aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMartin Schwidefsky <schwidefsky@de.ibm.com>2007-02-12 15:49:57 +0100
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2007-02-12 15:49:57 +0100
commit022ae414daadb718130679e4eacc105521f11ec7 (patch)
tree37f55e86e79d1847d7a6f8c9fce9e959dae3f5a5 /include
parent[S390] cio: use ARRAY_SIZE in device_id.c (diff)
downloadlinux-dev-022ae414daadb718130679e4eacc105521f11ec7.tar.xz
linux-dev-022ae414daadb718130679e4eacc105521f11ec7.zip
[S390] remove __io_virt and mmiowb.
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'include')
-rw-r--r--include/asm-s390/io.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/include/asm-s390/io.h b/include/asm-s390/io.h
index dca6a6cc103f..b7ff6afc3caa 100644
--- a/include/asm-s390/io.h
+++ b/include/asm-s390/io.h
@@ -17,8 +17,6 @@
#define IO_SPACE_LIMIT 0xffffffff
-#define __io_virt(x) ((void *)(PAGE_OFFSET | (unsigned long)(x)))
-
/*
* Change virtual addresses to physical addresses and vv.
* These are pretty trivial
@@ -37,11 +35,9 @@ static inline unsigned long virt_to_phys(volatile void * address)
static inline void * phys_to_virt(unsigned long address)
{
- return __io_virt(address);
+ return (void *) address;
}
-#define mmiowb() do { } while (0)
-
/*
* Convert a physical pointer to a virtual kernel pointer for /dev/mem
* access