lkml.org 
[lkml]   [2010]   [Feb]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:x86/io] x86-32: Remove _local variants of in/out from io_32.h
    Commit-ID:  bd2984e96452855d148ebce76f696dcecbc96340
    Gitweb: http://git.kernel.org/tip/bd2984e96452855d148ebce76f696dcecbc96340
    Author: Brian Gerst <brgerst@gmail.com>
    AuthorDate: Fri, 5 Feb 2010 09:37:04 -0500
    Committer: H. Peter Anvin <hpa@zytor.com>
    CommitDate: Fri, 5 Feb 2010 13:57:18 -0800

    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>
    ---
    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 e16b9db..72a6a4a 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)

    #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); \

    \
     
     \ /
      Last update: 2010-02-05 23:51    [W:0.027 / U:393.448 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site