linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: Kefeng Wang <wangkefeng.wang@huawei.com>
To: <catalin.marinas@arm.com>, <will@kernel.org>,
	<akpm@linux-foundation.org>,
	 <linux-arm-kernel@lists.infradead.org>,
	<linux-kernel@vger.kernel.org>
Cc: <linux-mm@kvack.org>, <hch@infradead.org>, <arnd@arndb.de>,
	Kefeng Wang <wangkefeng.wang@huawei.com>
Subject: [PATCH v2 1/5] mm: ioremap: Use more sensibly name in ioremap_prot()
Date: Fri, 29 Apr 2022 18:32:21 +0800	[thread overview]
Message-ID: <20220429103225.75121-2-wangkefeng.wang@huawei.com> (raw)
In-Reply-To: <20220429103225.75121-1-wangkefeng.wang@huawei.com>

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

Suggested-by: Andrew Morton <akpm@linux-foundation.org>
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


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

  reply	other threads:[~2022-04-29 10:30 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-04-29 10:32 [PATCH v2 0/5] arm64: Cleanup ioremap() and support ioremap_prot() Kefeng Wang
2022-04-29 10:32 ` Kefeng Wang [this message]
2022-05-02  9:38   ` [PATCH v2 1/5] mm: ioremap: Use more sensibly name in ioremap_prot() Anshuman Khandual
2022-04-29 10:32 ` [PATCH v2 2/5] mm: ioremap: Setup phys_addr of struct vm_struct Kefeng Wang
2022-05-02  9:50   ` Anshuman Khandual
2022-04-29 10:32 ` [PATCH v2 3/5] mm: ioremap: Add arch_ioremap/iounmap() Kefeng Wang
2022-05-19  4:46   ` Anshuman Khandual
2022-05-19  6:24     ` Kefeng Wang
2022-04-29 10:32 ` [PATCH v2 4/5] arm64: mm: Convert to GENERIC_IOREMAP Kefeng Wang
2022-04-29 23:15   ` kernel test robot
2022-05-02  3:27   ` [PATCH v2 resend " Kefeng Wang
2022-05-16 22:47     ` Catalin Marinas
2022-05-19  5:34     ` Anshuman Khandual
2022-05-19  6:31       ` Kefeng Wang
2022-04-29 10:32 ` [PATCH v2 5/5] arm64: Add HAVE_IOREMAP_PROT support Kefeng Wang
2022-05-16 22:48   ` Catalin Marinas
2022-05-19  5:06   ` Anshuman Khandual
2022-05-10  7:06 ` [PATCH v2 0/5] arm64: Cleanup ioremap() and support ioremap_prot() Kefeng Wang
2022-05-16 22:51 ` Catalin Marinas
2022-05-19  3:37   ` Kefeng Wang

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220429103225.75121-2-wangkefeng.wang@huawei.com \
    --to=wangkefeng.wang@huawei.com \
    --cc=akpm@linux-foundation.org \
    --cc=arnd@arndb.de \
    --cc=catalin.marinas@arm.com \
    --cc=hch@infradead.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=will@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).