lkml.org 
[lkml]   [2022]   [Jun]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v4 2/6] mm: ioremap: Use more sensibly name in ioremap_prot()
    Date
    Use more meaningful and sensibly naming phys_addr
    instead addr in ioremap_prot().

    Suggested-by: Andrew Morton <akpm@linux-foundation.org>
    Reviewed-by: Anshuman Khandual <anshuman.khandual@arm.com>
    Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
    ---
    include/asm-generic/io.h | 2 +-
    mm/ioremap.c | 12 ++++++------
    2 files changed, 7 insertions(+), 7 deletions(-)

    diff --git a/include/asm-generic/io.h b/include/asm-generic/io.h
    index 7ce93aaf69f8..e6ffa2519f08 100644
    --- a/include/asm-generic/io.h
    +++ b/include/asm-generic/io.h
    @@ -964,7 +964,7 @@ static inline void iounmap(volatile void __iomem *addr)
    #elif defined(CONFIG_GENERIC_IOREMAP)
    #include <linux/pgtable.h>

    -void __iomem *ioremap_prot(phys_addr_t addr, size_t size, unsigned long prot);
    +void __iomem *ioremap_prot(phys_addr_t phys_addr, size_t size, unsigned long prot);
    void iounmap(volatile void __iomem *addr);

    static inline void __iomem *ioremap(phys_addr_t addr, size_t size)
    diff --git a/mm/ioremap.c b/mm/ioremap.c
    index 5fe598ecd9b7..1f9597fbcc07 100644
    --- a/mm/ioremap.c
    +++ b/mm/ioremap.c
    @@ -11,20 +11,20 @@
    #include <linux/io.h>
    #include <linux/export.h>

    -void __iomem *ioremap_prot(phys_addr_t addr, size_t size, unsigned long prot)
    +void __iomem *ioremap_prot(phys_addr_t phys_addr, size_t size, unsigned long prot)
    {
    unsigned long offset, vaddr;
    phys_addr_t last_addr;
    struct vm_struct *area;

    /* Disallow wrap-around or zero size */
    - last_addr = addr + size - 1;
    - if (!size || last_addr < addr)
    + last_addr = phys_addr + size - 1;
    + if (!size || last_addr < phys_addr)
    return NULL;

    /* Page-align mappings */
    - offset = addr & (~PAGE_MASK);
    - addr -= offset;
    + offset = phys_addr & (~PAGE_MASK);
    + phys_addr -= offset;
    size = PAGE_ALIGN(size + offset);

    area = get_vm_area_caller(size, VM_IOREMAP,
    @@ -33,7 +33,7 @@ void __iomem *ioremap_prot(phys_addr_t addr, size_t size, unsigned long prot)
    return NULL;
    vaddr = (unsigned long)area->addr;

    - if (ioremap_page_range(vaddr, vaddr + size, addr, __pgprot(prot))) {
    + if (ioremap_page_range(vaddr, vaddr + size, phys_addr, __pgprot(prot))) {
    free_vm_area(area);
    return NULL;
    }
    --
    2.35.3
    \
     
     \ /
      Last update: 2022-06-06 09:40    [W:2.721 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site