lkml.org 
[lkml]   [2023]   [Feb]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v4 16/16] mm: ioremap: remove unneeded ioremap_allowed and iounmap_allowed
    Date
    Now there are no users of ioremap_allowed and iounmap_allowed, clean
    them up.

    Signed-off-by: Baoquan He <bhe@redhat.com>
    ---
    include/asm-generic/io.h | 26 --------------------------
    mm/ioremap.c | 6 ------
    2 files changed, 32 deletions(-)

    diff --git a/include/asm-generic/io.h b/include/asm-generic/io.h
    index 29ee791164ac..c13109d17dcb 100644
    --- a/include/asm-generic/io.h
    +++ b/include/asm-generic/io.h
    @@ -1047,32 +1047,6 @@ static inline void iounmap(volatile void __iomem *addr)
    #elif defined(CONFIG_GENERIC_IOREMAP)
    #include <linux/pgtable.h>

    -/*
    - * Arch code can implement the following two hooks when using GENERIC_IOREMAP
    - * ioremap_allowed() return a bool,
    - * - true means continue to remap
    - * - false means skip remap and return directly
    - * iounmap_allowed() return a bool,
    - * - true means continue to vunmap
    - * - false means skip vunmap and return directly
    - */
    -#ifndef ioremap_allowed
    -#define ioremap_allowed ioremap_allowed
    -static inline bool ioremap_allowed(phys_addr_t phys_addr, size_t size,
    - unsigned long prot)
    -{
    - return true;
    -}
    -#endif
    -
    -#ifndef iounmap_allowed
    -#define iounmap_allowed iounmap_allowed
    -static inline bool iounmap_allowed(void *addr)
    -{
    - return true;
    -}
    -#endif
    -
    void __iomem *generic_ioremap_prot(phys_addr_t phys_addr, size_t size,
    pgprot_t prot);

    diff --git a/mm/ioremap.c b/mm/ioremap.c
    index 4a7749d85044..8cb337446bba 100644
    --- a/mm/ioremap.c
    +++ b/mm/ioremap.c
    @@ -32,9 +32,6 @@ void __iomem *generic_ioremap_prot(phys_addr_t phys_addr, size_t size,
    phys_addr -= offset;
    size = PAGE_ALIGN(size + offset);

    - if (!ioremap_allowed(phys_addr, size, pgprot_val(prot)))
    - return NULL;
    -
    #ifdef IOREMAP_START
    area = __get_vm_area_caller(size, VM_IOREMAP, IOREMAP_START,
    IOREMAP_END, __builtin_return_address(0));
    @@ -68,9 +65,6 @@ void generic_iounmap(volatile void __iomem *addr)
    {
    void *vaddr = (void *)((unsigned long)addr & PAGE_MASK);

    - if (!iounmap_allowed(vaddr))
    - return;
    -
    if (is_ioremap_addr(vaddr))
    vunmap(vaddr);
    }
    --
    2.34.1
    \
     
     \ /
      Last update: 2023-03-27 00:25    [W:4.036 / U:0.192 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site