Commit abc5992b authored by Kefeng Wang's avatar Kefeng Wang Committed by Will Deacon
Browse files

mm: ioremap: Use more sensible name in ioremap_prot() 



Use more meaningful and sensible naming phys_addr
instead addr in ioremap_prot().

Suggested-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Reviewed-by: default avatarAnshuman Khandual <anshuman.khandual@arm.com>
Signed-off-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
Reviewed-by: default avatarBaoquan He <bhe@redhat.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20220610092255.32445-1-wangkefeng.wang@huawei.com


Signed-off-by: default avatarWill Deacon <will@kernel.org>
parent d803336a

include/asm-generic/io.h

+2 −1
Original line number Diff line number Diff line
@@ -964,7 +964,8 @@ 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)

mm/ioremap.c

+8 −6
Original line number Diff line number Diff line
@@ -11,20 +11,21 @@ 
#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 +34,8 @@ 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;

	}