[14/26] asm-generic: don't provide __ioremap
diff mbox series

Message ID 20190817073253.27819-15-hch@lst.de
State New
Headers show
Series
  • [01/26] mtd/maps/pxa2xx: use ioremap_cache insted of ioremap_cached
Related show

Commit Message

Christoph Hellwig Aug. 17, 2019, 7:32 a.m. UTC
__ioremap is not a kernel API, but used for helpers with differing
semantics in arch code.  We should not provide it in as-generic.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 include/asm-generic/io.h | 9 ---------
 1 file changed, 9 deletions(-)

Comments

Paul Walmsley Aug. 17, 2019, 8:58 p.m. UTC | #1
On Sat, 17 Aug 2019, Christoph Hellwig wrote:

> __ioremap is not a kernel API, but used for helpers with differing
> semantics in arch code.  We should not provide it in as-generic.
> 
> Signed-off-by: Christoph Hellwig <hch@lst.de>

Reviewed-by: Paul Walmsley <paul.walmsley@sifive.com>
Tested-by: Paul Walmsley <paul.walmsley@sifive.com> # rv32, rv64 boot
Acked-by: Paul Walmsley <paul.walmsley@sifive.com> # arch/riscv


- Paul
Paul Walmsley Aug. 17, 2019, 9:27 p.m. UTC | #2
On Sat, 17 Aug 2019, Paul Walmsley wrote:

> Acked-by: Paul Walmsley <paul.walmsley@sifive.com> # arch/riscv

This ack is superfluous since the patch doesn't touch arch/riscv; feel 
free to drop it


- Paul
Arnd Bergmann Aug. 30, 2019, 7:47 p.m. UTC | #3
On Fri, Aug 30, 2019 at 6:04 PM Christoph Hellwig <hch@lst.de> wrote:
>
> Arnd, can you consider this patch for asm-generic for 5.4?  I don't
> think I'll be able to feed the actual generic ioremap implementation
> to Linus this merge window, but if we can get as many patches as
> possible in through their maintainer trees that would make my life
> much easier.

Applied now, I missed it earlier when I was on vacation.

        Arnd
Christoph Hellwig Sept. 2, 2019, 8:01 a.m. UTC | #4
On Fri, Aug 30, 2019 at 09:47:45PM +0200, Arnd Bergmann wrote:
> On Fri, Aug 30, 2019 at 6:04 PM Christoph Hellwig <hch@lst.de> wrote:
> >
> > Arnd, can you consider this patch for asm-generic for 5.4?  I don't
> > think I'll be able to feed the actual generic ioremap implementation
> > to Linus this merge window, but if we can get as many patches as
> > possible in through their maintainer trees that would make my life
> > much easier.
> 
> Applied now, I missed it earlier when I was on vacation.

Thanks.  I think the next two patches (15 and 16) should also be
fine for the asm-generic tree for 5.4.  For patch 17 I'd rather have
all arch patches in first.

Patch
diff mbox series

diff --git a/include/asm-generic/io.h b/include/asm-generic/io.h
index b83e2802c969..d02806513670 100644
--- a/include/asm-generic/io.h
+++ b/include/asm-generic/io.h
@@ -963,15 +963,6 @@  static inline void __iomem *ioremap(phys_addr_t offset, size_t size)
 }
 #endif
 
-#ifndef __ioremap
-#define __ioremap __ioremap
-static inline void __iomem *__ioremap(phys_addr_t offset, size_t size,
-				      unsigned long flags)
-{
-	return ioremap(offset, size);
-}
-#endif
-
 #ifndef iounmap
 #define iounmap iounmap