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>, <anshuman.khandual@arm.com>, Kefeng Wang <wangkefeng.wang@huawei.com>, Russell King <linux@armlinux.org.uk> Subject: [PATCH v3 1/6] ARM: mm: kill unused runtime hook arch_iounmap() Date: Thu, 19 May 2022 16:25:47 +0800 [thread overview] Message-ID: <20220519082552.117736-2-wangkefeng.wang@huawei.com> (raw) In-Reply-To: <20220519082552.117736-1-wangkefeng.wang@huawei.com> Since the following commits, v5.4 commit 59d3ae9a5bf6 ("ARM: remove Intel iop33x and iop13xx support") v5.11 commit 3e3f354bc383 ("ARM: remove ebsa110 platform") The runtime hook arch_iounmap() on ARM is useless, kill arch_iounmap() and __iounmap(), and the naming of arch_iounmap will be used in GENERIC_IOREMAP with the later patch. Cc: Russell King <linux@armlinux.org.uk> Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com> --- arch/arm/include/asm/io.h | 4 +--- arch/arm/mm/ioremap.c | 9 +-------- arch/arm/mm/nommu.c | 9 +-------- 3 files changed, 3 insertions(+), 19 deletions(-) diff --git a/arch/arm/include/asm/io.h b/arch/arm/include/asm/io.h index 2a0739a2350b..d70727c9968f 100644 --- a/arch/arm/include/asm/io.h +++ b/arch/arm/include/asm/io.h @@ -139,11 +139,9 @@ extern void __iomem *__arm_ioremap_caller(phys_addr_t, size_t, unsigned int, extern void __iomem *__arm_ioremap_pfn(unsigned long, unsigned long, size_t, unsigned int); extern void __iomem *__arm_ioremap_exec(phys_addr_t, size_t, bool cached); void __arm_iomem_set_ro(void __iomem *ptr, size_t size); -extern void __iounmap(volatile void __iomem *addr); extern void __iomem * (*arch_ioremap_caller)(phys_addr_t, size_t, unsigned int, void *); -extern void (*arch_iounmap)(volatile void __iomem *); /* * Bad read/write accesses... @@ -399,7 +397,7 @@ void __iomem *ioremap_wc(resource_size_t res_cookie, size_t size); #define ioremap_wc ioremap_wc #define ioremap_wt ioremap_wc -void iounmap(volatile void __iomem *iomem_cookie); +void iounmap(volatile void __iomem *io_addr); #define iounmap iounmap void *arch_memremap_wb(phys_addr_t phys_addr, size_t size); diff --git a/arch/arm/mm/ioremap.c b/arch/arm/mm/ioremap.c index 290702328a33..e376926d6736 100644 --- a/arch/arm/mm/ioremap.c +++ b/arch/arm/mm/ioremap.c @@ -418,7 +418,7 @@ void *arch_memremap_wb(phys_addr_t phys_addr, size_t size) __builtin_return_address(0)); } -void __iounmap(volatile void __iomem *io_addr) +void iounmap(volatile void __iomem *io_addr) { void *addr = (void *)(PAGE_MASK & (unsigned long)io_addr); struct static_vm *svm; @@ -446,13 +446,6 @@ void __iounmap(volatile void __iomem *io_addr) vunmap(addr); } - -void (*arch_iounmap)(volatile void __iomem *) = __iounmap; - -void iounmap(volatile void __iomem *cookie) -{ - arch_iounmap(cookie); -} EXPORT_SYMBOL(iounmap); #ifdef CONFIG_PCI diff --git a/arch/arm/mm/nommu.c b/arch/arm/mm/nommu.c index 2658f52903da..c42debaded95 100644 --- a/arch/arm/mm/nommu.c +++ b/arch/arm/mm/nommu.c @@ -230,14 +230,7 @@ void *arch_memremap_wb(phys_addr_t phys_addr, size_t size) return (void *)phys_addr; } -void __iounmap(volatile void __iomem *addr) -{ -} -EXPORT_SYMBOL(__iounmap); - -void (*arch_iounmap)(volatile void __iomem *); - -void iounmap(volatile void __iomem *addr) +void iounmap(volatile void __iomem *io_addr) { } EXPORT_SYMBOL(iounmap); -- 2.35.3
WARNING: multiple messages have this Message-ID (diff)
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>, <anshuman.khandual@arm.com>, Kefeng Wang <wangkefeng.wang@huawei.com>, Russell King <linux@armlinux.org.uk> Subject: [PATCH v3 1/6] ARM: mm: kill unused runtime hook arch_iounmap() Date: Thu, 19 May 2022 16:25:47 +0800 [thread overview] Message-ID: <20220519082552.117736-2-wangkefeng.wang@huawei.com> (raw) In-Reply-To: <20220519082552.117736-1-wangkefeng.wang@huawei.com> Since the following commits, v5.4 commit 59d3ae9a5bf6 ("ARM: remove Intel iop33x and iop13xx support") v5.11 commit 3e3f354bc383 ("ARM: remove ebsa110 platform") The runtime hook arch_iounmap() on ARM is useless, kill arch_iounmap() and __iounmap(), and the naming of arch_iounmap will be used in GENERIC_IOREMAP with the later patch. Cc: Russell King <linux@armlinux.org.uk> Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com> --- arch/arm/include/asm/io.h | 4 +--- arch/arm/mm/ioremap.c | 9 +-------- arch/arm/mm/nommu.c | 9 +-------- 3 files changed, 3 insertions(+), 19 deletions(-) diff --git a/arch/arm/include/asm/io.h b/arch/arm/include/asm/io.h index 2a0739a2350b..d70727c9968f 100644 --- a/arch/arm/include/asm/io.h +++ b/arch/arm/include/asm/io.h @@ -139,11 +139,9 @@ extern void __iomem *__arm_ioremap_caller(phys_addr_t, size_t, unsigned int, extern void __iomem *__arm_ioremap_pfn(unsigned long, unsigned long, size_t, unsigned int); extern void __iomem *__arm_ioremap_exec(phys_addr_t, size_t, bool cached); void __arm_iomem_set_ro(void __iomem *ptr, size_t size); -extern void __iounmap(volatile void __iomem *addr); extern void __iomem * (*arch_ioremap_caller)(phys_addr_t, size_t, unsigned int, void *); -extern void (*arch_iounmap)(volatile void __iomem *); /* * Bad read/write accesses... @@ -399,7 +397,7 @@ void __iomem *ioremap_wc(resource_size_t res_cookie, size_t size); #define ioremap_wc ioremap_wc #define ioremap_wt ioremap_wc -void iounmap(volatile void __iomem *iomem_cookie); +void iounmap(volatile void __iomem *io_addr); #define iounmap iounmap void *arch_memremap_wb(phys_addr_t phys_addr, size_t size); diff --git a/arch/arm/mm/ioremap.c b/arch/arm/mm/ioremap.c index 290702328a33..e376926d6736 100644 --- a/arch/arm/mm/ioremap.c +++ b/arch/arm/mm/ioremap.c @@ -418,7 +418,7 @@ void *arch_memremap_wb(phys_addr_t phys_addr, size_t size) __builtin_return_address(0)); } -void __iounmap(volatile void __iomem *io_addr) +void iounmap(volatile void __iomem *io_addr) { void *addr = (void *)(PAGE_MASK & (unsigned long)io_addr); struct static_vm *svm; @@ -446,13 +446,6 @@ void __iounmap(volatile void __iomem *io_addr) vunmap(addr); } - -void (*arch_iounmap)(volatile void __iomem *) = __iounmap; - -void iounmap(volatile void __iomem *cookie) -{ - arch_iounmap(cookie); -} EXPORT_SYMBOL(iounmap); #ifdef CONFIG_PCI diff --git a/arch/arm/mm/nommu.c b/arch/arm/mm/nommu.c index 2658f52903da..c42debaded95 100644 --- a/arch/arm/mm/nommu.c +++ b/arch/arm/mm/nommu.c @@ -230,14 +230,7 @@ void *arch_memremap_wb(phys_addr_t phys_addr, size_t size) return (void *)phys_addr; } -void __iounmap(volatile void __iomem *addr) -{ -} -EXPORT_SYMBOL(__iounmap); - -void (*arch_iounmap)(volatile void __iomem *); - -void iounmap(volatile void __iomem *addr) +void iounmap(volatile void __iomem *io_addr) { } EXPORT_SYMBOL(iounmap); -- 2.35.3 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2022-05-19 8:18 UTC|newest] Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-05-19 8:25 [PATCH v3 0/6] arm64: Cleanup ioremap() and support ioremap_prot() Kefeng Wang 2022-05-19 8:25 ` Kefeng Wang 2022-05-19 8:25 ` Kefeng Wang [this message] 2022-05-19 8:25 ` [PATCH v3 1/6] ARM: mm: kill unused runtime hook arch_iounmap() Kefeng Wang 2022-05-19 8:51 ` Anshuman Khandual 2022-05-19 8:51 ` Anshuman Khandual 2022-05-20 15:28 ` Catalin Marinas 2022-05-20 15:28 ` Catalin Marinas 2022-05-24 2:03 ` Kefeng Wang 2022-05-24 2:03 ` Kefeng Wang 2022-05-21 20:30 ` Arnd Bergmann 2022-05-21 20:30 ` Arnd Bergmann 2022-05-19 8:25 ` [PATCH v3 2/6] mm: ioremap: Use more sensibly name in ioremap_prot() Kefeng Wang 2022-05-19 8:25 ` Kefeng Wang 2022-05-19 8:25 ` [PATCH v3 3/6] mm: ioremap: Setup phys_addr of struct vm_struct Kefeng Wang 2022-05-19 8:25 ` Kefeng Wang 2022-05-19 8:25 ` [PATCH v3 4/6] mm: ioremap: Add arch_ioremap/iounmap() Kefeng Wang 2022-05-19 8:25 ` Kefeng Wang 2022-05-19 18:52 ` Andrew Morton 2022-05-19 18:52 ` Andrew Morton 2022-05-20 1:22 ` Kefeng Wang 2022-05-20 1:22 ` Kefeng Wang 2022-05-23 3:57 ` Anshuman Khandual 2022-05-23 3:57 ` Anshuman Khandual 2022-05-23 22:17 ` kernel test robot 2022-05-23 22:17 ` kernel test robot 2022-05-24 9:48 ` Kefeng Wang 2022-05-24 9:48 ` Kefeng Wang 2022-05-24 9:48 ` Kefeng Wang 2022-05-24 12:35 ` Arnd Bergmann 2022-05-24 12:35 ` Arnd Bergmann 2022-05-24 12:35 ` Arnd Bergmann 2022-05-24 14:31 ` Kefeng Wang 2022-05-24 14:31 ` Kefeng Wang 2022-05-24 14:31 ` Kefeng Wang 2022-05-24 12:37 ` Arnd Bergmann 2022-05-24 12:37 ` Arnd Bergmann 2022-05-24 14:32 ` Kefeng Wang 2022-05-24 14:32 ` Kefeng Wang 2022-05-24 14:47 ` Arnd Bergmann 2022-05-24 14:47 ` Arnd Bergmann 2022-05-24 14:53 ` Kefeng Wang 2022-05-24 14:53 ` Kefeng Wang 2022-05-31 6:13 ` Christoph Hellwig 2022-05-31 6:13 ` Christoph Hellwig 2022-06-01 1:05 ` Kefeng Wang 2022-06-01 1:05 ` Kefeng Wang 2022-05-19 8:25 ` [PATCH v3 5/6] arm64: mm: Convert to GENERIC_IOREMAP Kefeng Wang 2022-05-19 8:25 ` Kefeng Wang 2022-05-19 8:25 ` [PATCH v3 6/6] arm64: Add HAVE_IOREMAP_PROT support Kefeng Wang 2022-05-19 8:25 ` 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=20220519082552.117736-2-wangkefeng.wang@huawei.com \ --to=wangkefeng.wang@huawei.com \ --cc=akpm@linux-foundation.org \ --cc=anshuman.khandual@arm.com \ --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=linux@armlinux.org.uk \ --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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.