From: Christoph Hellwig <hch@lst.de>
To: Arnd Bergmann <arnd@arndb.de>, Guo Ren <guoren@kernel.org>,
Michal Simek <monstr@monstr.eu>,
Greentime Hu <green.hu@gmail.com>,
Vincent Chen <deanbo422@gmail.com>, Guan Xuetao <gxt@pku.edu.cn>,
x86@kernel.org
Cc: linux-arch@vger.kernel.org, linux-s390@vger.kernel.org,
linux-ia64@vger.kernel.org, linux-parisc@vger.kernel.org,
linux-sh@vger.kernel.org, linux-hexagon@vger.kernel.org,
linux-xtensa@linux-xtensa.org, linux-mips@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-m68k@lists.linux-m68k.org,
openrisc@lists.librecores.org, linux-mtd@lists.infradead.org,
linux-alpha@vger.kernel.org, sparclinux@vger.kernel.org,
nios2-dev@lists.rocketboards.org,
linux-riscv@lists.infradead.org,
linux-snps-arc@lists.infradead.org,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH 02/26] arm, unicore32: remove ioremap_cached
Date: Sat, 17 Aug 2019 09:32:29 +0200 [thread overview]
Message-ID: <20190817073253.27819-3-hch@lst.de> (raw)
In-Reply-To: <20190817073253.27819-1-hch@lst.de>
No users of ioremap_cached are left, remove it.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
arch/arm/include/asm/io.h | 6 ------
arch/arm/mm/ioremap.c | 4 ----
arch/arm/mm/mmu.c | 2 +-
arch/arm/mm/nommu.c | 4 ----
arch/unicore32/include/asm/io.h | 4 +---
arch/unicore32/mm/ioremap.c | 8 --------
6 files changed, 2 insertions(+), 26 deletions(-)
diff --git a/arch/arm/include/asm/io.h b/arch/arm/include/asm/io.h
index 7a0596fcb2e7..924f9dd502ed 100644
--- a/arch/arm/include/asm/io.h
+++ b/arch/arm/include/asm/io.h
@@ -400,12 +400,6 @@ void __iomem *ioremap(resource_size_t res_cookie, size_t size);
void __iomem *ioremap_cache(resource_size_t res_cookie, size_t size);
#define ioremap_cache ioremap_cache
-/*
- * Do not use ioremap_cached in new code. Provided for the benefit of
- * the pxa2xx-flash MTD driver only.
- */
-void __iomem *ioremap_cached(resource_size_t res_cookie, size_t size);
-
void __iomem *ioremap_wc(resource_size_t res_cookie, size_t size);
#define ioremap_wc ioremap_wc
#define ioremap_wt ioremap_wc
diff --git a/arch/arm/mm/ioremap.c b/arch/arm/mm/ioremap.c
index d42b93316183..72286f9a4d30 100644
--- a/arch/arm/mm/ioremap.c
+++ b/arch/arm/mm/ioremap.c
@@ -382,15 +382,11 @@ void __iomem *ioremap(resource_size_t res_cookie, size_t size)
EXPORT_SYMBOL(ioremap);
void __iomem *ioremap_cache(resource_size_t res_cookie, size_t size)
- __alias(ioremap_cached);
-
-void __iomem *ioremap_cached(resource_size_t res_cookie, size_t size)
{
return arch_ioremap_caller(res_cookie, size, MT_DEVICE_CACHED,
__builtin_return_address(0));
}
EXPORT_SYMBOL(ioremap_cache);
-EXPORT_SYMBOL(ioremap_cached);
void __iomem *ioremap_wc(resource_size_t res_cookie, size_t size)
{
diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
index d9a0038774a6..ed08afc3f5e5 100644
--- a/arch/arm/mm/mmu.c
+++ b/arch/arm/mm/mmu.c
@@ -259,7 +259,7 @@ static struct mem_type mem_types[] __ro_after_init = {
.prot_sect = PROT_SECT_DEVICE,
.domain = DOMAIN_IO,
},
- [MT_DEVICE_CACHED] = { /* ioremap_cached */
+ [MT_DEVICE_CACHED] = { /* ioremap_cache */
.prot_pte = PROT_PTE_DEVICE | L_PTE_MT_DEV_CACHED,
.prot_l1 = PMD_TYPE_TABLE,
.prot_sect = PROT_SECT_DEVICE | PMD_SECT_WB,
diff --git a/arch/arm/mm/nommu.c b/arch/arm/mm/nommu.c
index 24ecf8d30a1e..8b3d7191e2b8 100644
--- a/arch/arm/mm/nommu.c
+++ b/arch/arm/mm/nommu.c
@@ -206,15 +206,11 @@ void __iomem *ioremap(resource_size_t res_cookie, size_t size)
EXPORT_SYMBOL(ioremap);
void __iomem *ioremap_cache(resource_size_t res_cookie, size_t size)
- __alias(ioremap_cached);
-
-void __iomem *ioremap_cached(resource_size_t res_cookie, size_t size)
{
return __arm_ioremap_caller(res_cookie, size, MT_DEVICE_CACHED,
__builtin_return_address(0));
}
EXPORT_SYMBOL(ioremap_cache);
-EXPORT_SYMBOL(ioremap_cached);
void __iomem *ioremap_wc(resource_size_t res_cookie, size_t size)
{
diff --git a/arch/unicore32/include/asm/io.h b/arch/unicore32/include/asm/io.h
index c71aa4b95996..4b460e01acfa 100644
--- a/arch/unicore32/include/asm/io.h
+++ b/arch/unicore32/include/asm/io.h
@@ -18,10 +18,9 @@
#include <asm-generic/io.h>
/*
- * __uc32_ioremap and __uc32_ioremap_cached takes CPU physical address.
+ * __uc32_ioremap takes CPU physical address.
*/
extern void __iomem *__uc32_ioremap(unsigned long, size_t);
-extern void __iomem *__uc32_ioremap_cached(unsigned long, size_t);
extern void __uc32_iounmap(volatile void __iomem *addr);
/*
@@ -32,7 +31,6 @@ extern void __uc32_iounmap(volatile void __iomem *addr);
*
*/
#define ioremap(cookie, size) __uc32_ioremap(cookie, size)
-#define ioremap_cached(cookie, size) __uc32_ioremap_cached(cookie, size)
#define ioremap_nocache(cookie, size) __uc32_ioremap(cookie, size)
#define iounmap(cookie) __uc32_iounmap(cookie)
diff --git a/arch/unicore32/mm/ioremap.c b/arch/unicore32/mm/ioremap.c
index cf6d656f240c..46a64bd6156a 100644
--- a/arch/unicore32/mm/ioremap.c
+++ b/arch/unicore32/mm/ioremap.c
@@ -220,14 +220,6 @@ __uc32_ioremap(unsigned long phys_addr, size_t size)
}
EXPORT_SYMBOL(__uc32_ioremap);
-void __iomem *
-__uc32_ioremap_cached(unsigned long phys_addr, size_t size)
-{
- return __uc32_ioremap_caller(phys_addr, size, MT_DEVICE_CACHED,
- __builtin_return_address(0));
-}
-EXPORT_SYMBOL(__uc32_ioremap_cached);
-
void __uc32_iounmap(volatile void __iomem *io_addr)
{
void *addr = (void *)(PAGE_MASK & (unsigned long)io_addr);
--
2.20.1
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
next prev parent reply other threads:[~2019-08-17 7:39 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-17 7:32 generic ioremap (and lots of cleanups) Christoph Hellwig
2019-08-17 7:32 ` [PATCH 01/26] mtd/maps/pxa2xx: use ioremap_cache insted of ioremap_cached Christoph Hellwig
2019-08-17 7:32 ` Christoph Hellwig [this message]
2019-08-17 7:32 ` [PATCH 03/26] m68k, microblaze: remove ioremap_fullcache Christoph Hellwig
2019-08-19 8:50 ` Geert Uytterhoeven
2019-09-02 14:16 ` Michal Simek
2019-08-17 7:32 ` [PATCH 04/26] mips: remove ioremap_cachable Christoph Hellwig
2019-08-19 20:57 ` Paul Burton
2019-08-30 16:06 ` Christoph Hellwig
2019-09-03 8:57 ` Paul Burton
2019-08-17 7:32 ` [PATCH 05/26] openrisc: map as uncached in ioremap Christoph Hellwig
2019-08-23 13:55 ` Stafford Horne
2019-08-30 16:07 ` Christoph Hellwig
2019-08-30 21:45 ` Stafford Horne
2019-08-17 7:32 ` [PATCH 06/26] ia64: rename ioremap_nocache to ioremap_uc Christoph Hellwig
2019-08-17 16:00 ` Sergei Shtylyov
2019-08-17 7:32 ` [PATCH 07/26] hexagon: clean up ioremap Christoph Hellwig
2019-08-17 7:32 ` [PATCH 08/26] m68k: simplify ioremap_nocache Christoph Hellwig
2019-08-19 8:56 ` Geert Uytterhoeven
2019-08-19 9:18 ` Christoph Hellwig
2019-08-30 16:06 ` Christoph Hellwig
2019-09-02 7:53 ` Geert Uytterhoeven
2019-08-17 7:32 ` [PATCH 09/26] alpha: remove the unused __ioremap wrapper Christoph Hellwig
2019-08-17 7:32 ` [PATCH 10/26] nios2: remove __ioremap Christoph Hellwig
2019-08-17 7:32 ` [PATCH 11/26] parisc: " Christoph Hellwig
2019-08-17 7:32 ` [PATCH 12/26] x86: clean up ioremap Christoph Hellwig
2019-08-17 10:34 ` Ingo Molnar
2019-08-30 16:04 ` Christoph Hellwig
2019-08-17 7:32 ` [PATCH 13/26] xtensa: " Christoph Hellwig
2019-08-17 7:32 ` [PATCH 14/26] asm-generic: don't provide __ioremap Christoph Hellwig
2019-08-17 20:58 ` Paul Walmsley
2019-08-17 21:27 ` Paul Walmsley
2019-08-17 7:32 ` [PATCH 15/26] asm-generic: ioremap_uc should behave the same with and without MMU Christoph Hellwig
2019-08-17 21:07 ` Paul Walmsley
2019-08-17 7:32 ` [PATCH 16/26] asm-generic: don't provide ioremap for CONFIG_MMU Christoph Hellwig
2019-08-17 21:15 ` Paul Walmsley
2019-08-17 7:32 ` [PATCH 17/26] arch: rely on asm-generic/io.h for default ioremap_* definitions Christoph Hellwig
2019-08-17 21:13 ` Paul Walmsley
2019-08-17 7:32 ` [PATCH 18/26] m68k: rename __iounmap and mark it static Christoph Hellwig
2019-08-19 9:00 ` Geert Uytterhoeven
2019-08-17 7:32 ` [PATCH 19/26] arm64: remove __iounmap Christoph Hellwig
2019-08-19 7:36 ` Will Deacon
2019-08-30 16:05 ` Christoph Hellwig
2019-08-31 16:29 ` Will Deacon
2019-08-17 7:32 ` [PATCH 20/26] hexagon: " Christoph Hellwig
2019-08-17 7:32 ` [PATCH 21/26] nios2: " Christoph Hellwig
2019-08-17 7:32 ` [PATCH 22/26] sh: " Christoph Hellwig
2019-08-17 7:32 ` [PATCH 23/26] lib: provide a simple generic ioremap implementation Christoph Hellwig
2019-08-17 7:32 ` [PATCH 24/26] riscv: use the generic ioremap code Christoph Hellwig
2019-08-17 21:22 ` Paul Walmsley
2019-09-01 8:02 ` Christoph Hellwig
2019-08-17 7:32 ` [PATCH 25/26] csky: use generic ioremap Christoph Hellwig
2019-08-17 7:32 ` [PATCH 26/26] nds32: " Christoph Hellwig
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=20190817073253.27819-3-hch@lst.de \
--to=hch@lst.de \
--cc=arnd@arndb.de \
--cc=deanbo422@gmail.com \
--cc=green.hu@gmail.com \
--cc=guoren@kernel.org \
--cc=gxt@pku.edu.cn \
--cc=linux-alpha@vger.kernel.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-hexagon@vger.kernel.org \
--cc=linux-ia64@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-m68k@lists.linux-m68k.org \
--cc=linux-mips@vger.kernel.org \
--cc=linux-mtd@lists.infradead.org \
--cc=linux-parisc@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=linux-s390@vger.kernel.org \
--cc=linux-sh@vger.kernel.org \
--cc=linux-snps-arc@lists.infradead.org \
--cc=linux-xtensa@linux-xtensa.org \
--cc=monstr@monstr.eu \
--cc=nios2-dev@lists.rocketboards.org \
--cc=openrisc@lists.librecores.org \
--cc=sparclinux@vger.kernel.org \
--cc=x86@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).