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>

diff --git a/arch/x86/include/asm/io_32.h b/arch/x86/include/asm/io_32.h
index e16b9dbef81ab68b0f312545b0d8a9f8c33ab26d..72a6a4a930ae8101ae89ea12c8bd423051322aea 100644 (file)
--- 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)
 
 #endif
 
-#define __BUILDIO(bwl, bw, type)                               \
-static inline void out##bwl(unsigned type value, int port)     \
-{                                                              \
-       out##bwl##_local(value, port);                          \
-}                                                              \
-                                                               \
-static inline unsigned type in##bwl(int port)                  \
-{                                                              \
-       return in##bwl##_local(port);                           \
-}
-
 #define BUILDIO(bwl, bw, type)                                         \
-static inline void out##bwl##_local(unsigned type value, int port)     \
+static inline void out##bwl(unsigned type value, int port)             \
 {                                                                      \
-       asm volatile("out" #bwl " %" #bw "0, %w1"               \
+       asm volatile("out" #bwl " %" #bw "0, %w1"                       \
                     : : "a"(value), "Nd"(port));                       \
 }                                                                      \
                                                                        \
-static inline unsigned type in##bwl##_local(int port)                  \
+static inline unsigned type in##bwl(int port)                          \
 {                                                                      \
        unsigned type value;                                            \
-       asm volatile("in" #bwl " %w1, %" #bw "0"                \
+       asm volatile("in" #bwl " %w1, %" #bw "0"                        \
                     : "=a"(value) : "Nd"(port));                       \
        return value;                                                   \
 }                                                                      \
                                                                        \
-static inline void out##bwl##_local_p(unsigned type value, int port)   \
-{                                                                      \
-       out##bwl##_local(value, port);                                  \
-       slow_down_io();                                                 \
-}                                                                      \
-                                                                       \
-static inline unsigned type in##bwl##_local_p(int port)                        \
-{                                                                      \
-       unsigned type value = in##bwl##_local(port);                    \
-       slow_down_io();                                                 \
-       return value;                                                   \
-}                                                                      \
-                                                                       \
-__BUILDIO(bwl, bw, type)                                               \
-                                                                       \
 static inline void out##bwl##_p(unsigned type value, int port)         \
 {                                                                      \
        out##bwl(value, port);                                          \