diff options
| author | Brian Gerst <brgerst@gmail.com> | 2010-02-05 09:37:04 -0500 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2010-02-05 16:57:18 -0500 |
| commit | bd2984e96452855d148ebce76f696dcecbc96340 (patch) | |
| tree | 3a7a9fbb7730f5df7809b3e0de215612ecc9e6ce | |
| parent | 5c64c7019e571a726f4aa9c1896402c15391a8ed (diff) | |
x86-32: Remove _local variants of in/out from io_32.h
These were leftover from the numaq support that was removed in commit
1fba38703d0ce8a5ff0fad9df3eccc6b55cf2cfb.
Signed-off-by: Brian Gerst <brgerst@gmail.com>
LKML-Reference: <1265380629-3212-3-git-send-email-brgerst@gmail.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
| -rw-r--r-- | arch/x86/include/asm/io_32.h | 34 |
1 files changed, 4 insertions, 30 deletions
diff --git a/arch/x86/include/asm/io_32.h b/arch/x86/include/asm/io_32.h index e16b9dbef81a..72a6a4a930ae 100644 --- a/arch/x86/include/asm/io_32.h +++ b/arch/x86/include/asm/io_32.h | |||
| @@ -120,47 +120,21 @@ static inline void slow_down_io(void) | |||
| 120 | 120 | ||
| 121 | #endif | 121 | #endif |
| 122 | 122 | ||
| 123 | #define __BUILDIO(bwl, bw, type) \ | ||
| 124 | static inline void out##bwl(unsigned type value, int port) \ | ||
| 125 | { \ | ||
| 126 | out##bwl##_local(value, port); \ | ||
| 127 | } \ | ||
| 128 | \ | ||
| 129 | static inline unsigned type in##bwl(int port) \ | ||
| 130 | { \ | ||
| 131 | return in##bwl##_local(port); \ | ||
| 132 | } | ||
| 133 | |||
| 134 | #define BUILDIO(bwl, bw, type) \ | 123 | #define BUILDIO(bwl, bw, type) \ |
| 135 | static inline void out##bwl##_local(unsigned type value, int port) \ | 124 | static inline void out##bwl(unsigned type value, int port) \ |
| 136 | { \ | 125 | { \ |
| 137 | asm volatile("out" #bwl " %" #bw "0, %w1" \ | 126 | asm volatile("out" #bwl " %" #bw "0, %w1" \ |
| 138 | : : "a"(value), "Nd"(port)); \ | 127 | : : "a"(value), "Nd"(port)); \ |
| 139 | } \ | 128 | } \ |
| 140 | \ | 129 | \ |
| 141 | static inline unsigned type in##bwl##_local(int port) \ | 130 | static inline unsigned type in##bwl(int port) \ |
| 142 | { \ | 131 | { \ |
| 143 | unsigned type value; \ | 132 | unsigned type value; \ |
| 144 | asm volatile("in" #bwl " %w1, %" #bw "0" \ | 133 | asm volatile("in" #bwl " %w1, %" #bw "0" \ |
| 145 | : "=a"(value) : "Nd"(port)); \ | 134 | : "=a"(value) : "Nd"(port)); \ |
| 146 | return value; \ | 135 | return value; \ |
| 147 | } \ | 136 | } \ |
| 148 | \ | 137 | \ |
| 149 | static inline void out##bwl##_local_p(unsigned type value, int port) \ | ||
| 150 | { \ | ||
| 151 | out##bwl##_local(value, port); \ | ||
| 152 | slow_down_io(); \ | ||
| 153 | } \ | ||
| 154 | \ | ||
| 155 | static inline unsigned type in##bwl##_local_p(int port) \ | ||
| 156 | { \ | ||
| 157 | unsigned type value = in##bwl##_local(port); \ | ||
| 158 | slow_down_io(); \ | ||
| 159 | return value; \ | ||
| 160 | } \ | ||
| 161 | \ | ||
| 162 | __BUILDIO(bwl, bw, type) \ | ||
| 163 | \ | ||
| 164 | static inline void out##bwl##_p(unsigned type value, int port) \ | 138 | static inline void out##bwl##_p(unsigned type value, int port) \ |
| 165 | { \ | 139 | { \ |
| 166 | out##bwl(value, port); \ | 140 | out##bwl(value, port); \ |