Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e295066f authored by Geert Uytterhoeven's avatar Geert Uytterhoeven
Browse files

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: 9746882f ("m68k: group io mapping definitions and functions")
Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Acked-by: default avatarGreg Ungerer <gerg@linux-m68k.org>
parent d7de1c3a

arch/m68k/include/asm/io_mm.h

+0 −2
Original line number Diff line number Diff line
@@ -21,8 +21,6 @@ 


#ifdef __KERNEL__



#define ARCH_HAS_IOREMAP_WT



#include <linux/compiler.h>

#include <asm/raw_io.h>

#include <asm/virtconvert.h>

arch/m68k/include/asm/kmap.h

+5 −1
Original line number Diff line number Diff line
@@ -4,6 +4,8 @@ 


#ifdef CONFIG_MMU



#define ARCH_HAS_IOREMAP_WT



/* Values for nocacheflag and cmode */

#define IOMAP_FULL_CACHING		0

#define IOMAP_NOCACHE_SER		1
@@ -16,6 +18,7 @@ 
 */

extern void __iomem *__ioremap(unsigned long physaddr, unsigned long size,

			       int cacheflag);

#define iounmap iounmap

extern void iounmap(void __iomem *addr);

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_wt ioremap_wt

static inline void __iomem *ioremap_wt(unsigned long physaddr,

				       unsigned long size)

{

	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,

					      unsigned long size)

{