lkml.org 
[lkml]   [2019]   [Oct]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 02/21] unicore32: remove ioremap_cached
    Date
    No users of ioremap_cached are left, remove it.

    Signed-off-by: Christoph Hellwig <hch@lst.de>
    ---
    arch/unicore32/include/asm/io.h | 4 +---
    arch/unicore32/mm/ioremap.c | 8 --------
    2 files changed, 1 insertion(+), 11 deletions(-)

    diff --git a/arch/unicore32/include/asm/io.h b/arch/unicore32/include/asm/io.h
    index c71aa4b95996..4b460e01acfa 100644
    --- a/arch/unicore32/include/asm/io.h
    +++ b/arch/unicore32/include/asm/io.h
    @@ -18,10 +18,9 @@
    #include <asm-generic/io.h>

    /*
    - * __uc32_ioremap and __uc32_ioremap_cached takes CPU physical address.
    + * __uc32_ioremap takes CPU physical address.
    */
    extern void __iomem *__uc32_ioremap(unsigned long, size_t);
    -extern void __iomem *__uc32_ioremap_cached(unsigned long, size_t);
    extern void __uc32_iounmap(volatile void __iomem *addr);

    /*
    @@ -32,7 +31,6 @@ extern void __uc32_iounmap(volatile void __iomem *addr);
    *
    */
    #define ioremap(cookie, size) __uc32_ioremap(cookie, size)
    -#define ioremap_cached(cookie, size) __uc32_ioremap_cached(cookie, size)
    #define ioremap_nocache(cookie, size) __uc32_ioremap(cookie, size)
    #define iounmap(cookie) __uc32_iounmap(cookie)

    diff --git a/arch/unicore32/mm/ioremap.c b/arch/unicore32/mm/ioremap.c
    index cf6d656f240c..46a64bd6156a 100644
    --- a/arch/unicore32/mm/ioremap.c
    +++ b/arch/unicore32/mm/ioremap.c
    @@ -220,14 +220,6 @@ __uc32_ioremap(unsigned long phys_addr, size_t size)
    }
    EXPORT_SYMBOL(__uc32_ioremap);

    -void __iomem *
    -__uc32_ioremap_cached(unsigned long phys_addr, size_t size)
    -{
    - return __uc32_ioremap_caller(phys_addr, size, MT_DEVICE_CACHED,
    - __builtin_return_address(0));
    -}
    -EXPORT_SYMBOL(__uc32_ioremap_cached);
    -
    void __uc32_iounmap(volatile void __iomem *io_addr)
    {
    void *addr = (void *)(PAGE_MASK & (unsigned long)io_addr);
    --
    2.20.1
    \
     
     \ /
      Last update: 2019-10-29 07:49    [W:2.165 / U:0.048 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site