| Message ID | 20190817073253.27819-9-hch@lst.de (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | [01/26] mtd/maps/pxa2xx: use ioremap_cache insted of ioremap_cached | expand |
Hi Christoph, On Sat, Aug 17, 2019 at 9:48 AM Christoph Hellwig <hch@lst.de> wrote: > Just define ioremap_nocache to ioremap instead of duplicating the > inline. Also defined ioremap_uc in terms of ioremap instead of > the using a double indirection. > > Signed-off-by: Christoph Hellwig <hch@lst.de> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> BTW, shouldn't we get rid of the sole user of ioremap_uc(), too? Seems to make a difference on x86 only, where it is "strongly uncached" (whatever that may mean ;-) Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
On Mon, Aug 19, 2019 at 10:56:02AM +0200, Geert Uytterhoeven wrote: > BTW, shouldn't we get rid of the sole user of ioremap_uc(), too? > Seems to make a difference on x86 only, where it is "strongly uncached" > (whatever that may mean ;-) Yes, we probably should. However that actually seems worth a discussion so I wanted to defer it until after this already huge series. Another thing we can do after this series is to kill of ioremap_nocache.
On Mon, Aug 19, 2019 at 10:56:02AM +0200, Geert Uytterhoeven wrote: > Hi Christoph, > > On Sat, Aug 17, 2019 at 9:48 AM Christoph Hellwig <hch@lst.de> wrote: > > Just define ioremap_nocache to ioremap instead of duplicating the > > inline. Also defined ioremap_uc in terms of ioremap instead of > > the using a double indirection. > > > > Signed-off-by: Christoph Hellwig <hch@lst.de> > > Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> Do you mind picking this up through the m68k tree?
Hi Christoph, On Fri, Aug 30, 2019 at 6:06 PM Christoph Hellwig <hch@lst.de> wrote: > On Mon, Aug 19, 2019 at 10:56:02AM +0200, Geert Uytterhoeven wrote: > > On Sat, Aug 17, 2019 at 9:48 AM Christoph Hellwig <hch@lst.de> wrote: > > > Just define ioremap_nocache to ioremap instead of duplicating the > > > inline. Also defined ioremap_uc in terms of ioremap instead of > > > the using a double indirection. > > > > > > Signed-off-by: Christoph Hellwig <hch@lst.de> > > > > Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> > > Do you mind picking this up through the m68k tree? Sure. Applied and queued for v5.4. Gr{oetje,eeting}s, Geert
diff --git a/arch/m68k/include/asm/kmap.h b/arch/m68k/include/asm/kmap.h index 03d904fe6087..421b6c9c769d 100644 --- a/arch/m68k/include/asm/kmap.h +++ b/arch/m68k/include/asm/kmap.h @@ -28,14 +28,8 @@ static inline void __iomem *ioremap(unsigned long physaddr, unsigned long size) return __ioremap(physaddr, size, IOMAP_NOCACHE_SER); } -#define ioremap_nocache ioremap_nocache -static inline void __iomem *ioremap_nocache(unsigned long physaddr, - unsigned long size) -{ - return __ioremap(physaddr, size, IOMAP_NOCACHE_SER); -} - -#define ioremap_uc ioremap_nocache +#define ioremap_nocache ioremap +#define ioremap_uc ioremap #define ioremap_wt ioremap_wt static inline void __iomem *ioremap_wt(unsigned long physaddr, unsigned long size)
Just define ioremap_nocache to ioremap instead of duplicating the inline. Also defined ioremap_uc in terms of ioremap instead of the using a double indirection. Signed-off-by: Christoph Hellwig <hch@lst.de> --- arch/m68k/include/asm/kmap.h | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-)