| Message ID | 20191017174554.29840-21-hch@lst.de (mailing list archive) |
|---|---|
| State | Awaiting Upstream |
| Headers | show |
| Series | [01/21] arm: remove ioremap_cached | expand |
Acked-by: Guo Ren <guoren@kernel.org> On Fri, Oct 18, 2019 at 1:47 AM Christoph Hellwig <hch@lst.de> wrote: > > No driver that can be used on csky uses ioremap_cache, and this > interface has been deprecated in favor of memremap. > > Signed-off-by: Christoph Hellwig <hch@lst.de> > --- > arch/csky/include/asm/io.h | 2 -- > arch/csky/mm/ioremap.c | 7 ------- > 2 files changed, 9 deletions(-) > > diff --git a/arch/csky/include/asm/io.h b/arch/csky/include/asm/io.h > index a4b9fb616faa..f572605d5ad5 100644 > --- a/arch/csky/include/asm/io.h > +++ b/arch/csky/include/asm/io.h > @@ -36,13 +36,11 @@ > /* > * I/O memory mapping functions. > */ > -extern void __iomem *ioremap_cache(phys_addr_t addr, size_t size); > extern void __iomem *__ioremap(phys_addr_t addr, size_t size, pgprot_t prot); > extern void iounmap(void *addr); > > #define ioremap(addr, size) __ioremap((addr), (size), pgprot_noncached(PAGE_KERNEL)) > #define ioremap_wc(addr, size) __ioremap((addr), (size), pgprot_writecombine(PAGE_KERNEL)) > -#define ioremap_cache ioremap_cache > > #include <asm-generic/io.h> > > diff --git a/arch/csky/mm/ioremap.c b/arch/csky/mm/ioremap.c > index e13cd3497628..ae78256a56fd 100644 > --- a/arch/csky/mm/ioremap.c > +++ b/arch/csky/mm/ioremap.c > @@ -44,13 +44,6 @@ void __iomem *__ioremap(phys_addr_t phys_addr, size_t size, pgprot_t prot) > } > EXPORT_SYMBOL(__ioremap); > > -void __iomem *ioremap_cache(phys_addr_t phys_addr, size_t size) > -{ > - return __ioremap_caller(phys_addr, size, PAGE_KERNEL, > - __builtin_return_address(0)); > -} > -EXPORT_SYMBOL(ioremap_cache); > - > void iounmap(void __iomem *addr) > { > vunmap((void *)((unsigned long)addr & PAGE_MASK)); > -- > 2.20.1 >
On Mon, Oct 21, 2019 at 03:58:28PM +0800, Guo Ren wrote:
> Acked-by: Guo Ren <guoren@kernel.org>
Can you also take a look at the next patch and give me a review?
diff --git a/arch/csky/include/asm/io.h b/arch/csky/include/asm/io.h index a4b9fb616faa..f572605d5ad5 100644 --- a/arch/csky/include/asm/io.h +++ b/arch/csky/include/asm/io.h @@ -36,13 +36,11 @@ /* * I/O memory mapping functions. */ -extern void __iomem *ioremap_cache(phys_addr_t addr, size_t size); extern void __iomem *__ioremap(phys_addr_t addr, size_t size, pgprot_t prot); extern void iounmap(void *addr); #define ioremap(addr, size) __ioremap((addr), (size), pgprot_noncached(PAGE_KERNEL)) #define ioremap_wc(addr, size) __ioremap((addr), (size), pgprot_writecombine(PAGE_KERNEL)) -#define ioremap_cache ioremap_cache #include <asm-generic/io.h> diff --git a/arch/csky/mm/ioremap.c b/arch/csky/mm/ioremap.c index e13cd3497628..ae78256a56fd 100644 --- a/arch/csky/mm/ioremap.c +++ b/arch/csky/mm/ioremap.c @@ -44,13 +44,6 @@ void __iomem *__ioremap(phys_addr_t phys_addr, size_t size, pgprot_t prot) } EXPORT_SYMBOL(__ioremap); -void __iomem *ioremap_cache(phys_addr_t phys_addr, size_t size) -{ - return __ioremap_caller(phys_addr, size, PAGE_KERNEL, - __builtin_return_address(0)); -} -EXPORT_SYMBOL(ioremap_cache); - void iounmap(void __iomem *addr) { vunmap((void *)((unsigned long)addr & PAGE_MASK));
No driver that can be used on csky uses ioremap_cache, and this interface has been deprecated in favor of memremap. Signed-off-by: Christoph Hellwig <hch@lst.de> --- arch/csky/include/asm/io.h | 2 -- arch/csky/mm/ioremap.c | 7 ------- 2 files changed, 9 deletions(-)