lkml.org 
[lkml]   [2019]   [Aug]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 13/26] xtensa: clean up ioremap
    Date
    Use ioremap as the main implemented function, and defined
    ioremap_nocache to it as a deprecated alias.

    Signed-off-by: Christoph Hellwig <hch@lst.de>
    ---
    arch/xtensa/include/asm/io.h | 14 ++++----------
    1 file changed, 4 insertions(+), 10 deletions(-)

    diff --git a/arch/xtensa/include/asm/io.h b/arch/xtensa/include/asm/io.h
    index da3e783f896b..ffadc99c8601 100644
    --- a/arch/xtensa/include/asm/io.h
    +++ b/arch/xtensa/include/asm/io.h
    @@ -31,8 +31,7 @@ void xtensa_iounmap(volatile void __iomem *addr);
    /*
    * Return the virtual address for the specified bus memory.
    */
    -static inline void __iomem *ioremap_nocache(unsigned long offset,
    - unsigned long size)
    +static inline void __iomem *ioremap(unsigned long offset, unsigned long size)
    {
    if (offset >= XCHAL_KIO_PADDR
    && offset - XCHAL_KIO_PADDR < XCHAL_KIO_SIZE)
    @@ -51,15 +50,10 @@ static inline void __iomem *ioremap_cache(unsigned long offset,
    return xtensa_ioremap_cache(offset, size);
    }
    #define ioremap_cache ioremap_cache
    -#define ioremap_nocache ioremap_nocache
    -
    -#define ioremap_wc ioremap_nocache
    -#define ioremap_wt ioremap_nocache

    -static inline void __iomem *ioremap(unsigned long offset, unsigned long size)
    -{
    - return ioremap_nocache(offset, size);
    -}
    +#define ioremap_nocache ioremap
    +#define ioremap_wc ioremap
    +#define ioremap_wt ioremap

    static inline void iounmap(volatile void __iomem *addr)
    {
    --
    2.20.1
    \
     
     \ /
      Last update: 2019-08-17 09:51    [W:4.052 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site