OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

m68k/io: Add missing ioremap define guards, fix typo 

- Add missing define guard for ioremap_wt(),
  - Move ARCH_HAS_IOREMAP_WT from <asm/io_mm.h> to <asm/kmap.h>, as it
    is applicable to Coldfire with MMU, too,
  - Fix typo s/ioremap_fillcache/ioremap_fullcache/,
  - Add define guard for iounmap() for consistency with other
    architectures.

Fixes: 9746882f54 ("m68k: group io mapping definitions and functions")
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: Greg Ungerer <gerg@linux-m68k.org>
This commit is contained in:
Geert Uytterhoeven 2018-06-26 18:41:11 +02:00
parent d7de1c3af1
commit e295066f66
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/m68k/include/asm/io_mm.h
View File

@ -21,8 +21,6 @@
#ifdef __KERNEL__ #ifdef __KERNEL__
#define ARCH_HAS_IOREMAP_WT
#include <linux/compiler.h> #include <linux/compiler.h>
#include <asm/raw_io.h> #include <asm/raw_io.h>
#include <asm/virtconvert.h> #include <asm/virtconvert.h>

6
arch/m68k/include/asm/kmap.h
View File

@ -4,6 +4,8 @@
#ifdef CONFIG_MMU #ifdef CONFIG_MMU
#define ARCH_HAS_IOREMAP_WT
/* Values for nocacheflag and cmode */ /* Values for nocacheflag and cmode */
#define IOMAP_FULL_CACHING 0 #define IOMAP_FULL_CACHING 0
#define IOMAP_NOCACHE_SER 1 #define IOMAP_NOCACHE_SER 1
@ -16,6 +18,7 @@
*/ */
extern void __iomem *__ioremap(unsigned long physaddr, unsigned long size, extern void __iomem *__ioremap(unsigned long physaddr, unsigned long size,
int cacheflag); int cacheflag);
#define iounmap iounmap
extern void iounmap(void __iomem *addr); extern void iounmap(void __iomem *addr);
extern void __iounmap(void *addr, unsigned long size); extern void __iounmap(void *addr, unsigned long size);
@ -33,13 +36,14 @@ static inline void __iomem *ioremap_nocache(unsigned long physaddr,
} }
#define ioremap_uc ioremap_nocache #define ioremap_uc ioremap_nocache
#define ioremap_wt ioremap_wt
static inline void __iomem *ioremap_wt(unsigned long physaddr, static inline void __iomem *ioremap_wt(unsigned long physaddr,
unsigned long size) unsigned long size)
{ {
return __ioremap(physaddr, size, IOMAP_WRITETHROUGH); return __ioremap(physaddr, size, IOMAP_WRITETHROUGH);
} }
#define ioremap_fillcache ioremap_fullcache #define ioremap_fullcache ioremap_fullcache
static inline void __iomem *ioremap_fullcache(unsigned long physaddr, static inline void __iomem *ioremap_fullcache(unsigned long physaddr,
unsigned long size) unsigned long size)
{ {