Commit 3eef6b74 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Rich Felker
Browse files

sh: move ioremap_fixed details out of <asm/io.h> 



ioremap_fixed is an internal implementation detail and should not be
exposed to drivers.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarRich Felker <dalias@libc.org>
parent e12b090e

arch/sh/include/asm/io.h

+0 −16
Original line number Diff line number Diff line
@@ -346,22 +346,6 @@ ioremap_prot(phys_addr_t offset, unsigned long size, unsigned long flags) 
}

#endif



#ifdef CONFIG_IOREMAP_FIXED

extern void __iomem *ioremap_fixed(phys_addr_t, unsigned long, pgprot_t);

extern int iounmap_fixed(void __iomem *);

extern void ioremap_fixed_init(void);

#else

static inline void __iomem *

ioremap_fixed(phys_addr_t phys_addr, unsigned long size, pgprot_t prot)

{

	BUG();

	return NULL;

}



static inline void ioremap_fixed_init(void) { }

static inline int iounmap_fixed(void __iomem *addr) { return -EINVAL; }

#endif



#define ioremap_uc	ioremap



/*

arch/sh/mm/init.c

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <asm/setup.h>

#include <asm/cache.h>

#include <linux/sizes.h>

#include "ioremap.h"



pgd_t swapper_pg_dir[PTRS_PER_PGD];

arch/sh/mm/ioremap.c

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <asm/cacheflush.h>

#include <asm/tlbflush.h>

#include <asm/mmu.h>

#include "ioremap.h"



/*

 * Remap an arbitrary physical address space into the kernel virtual

arch/sh/mm/ioremap.h

0 → 100644
+23 −0
Original line number Diff line number Diff line 
#ifndef _SH_MM_IORMEMAP_H

#define _SH_MM_IORMEMAP_H 1



#ifdef CONFIG_IOREMAP_FIXED

void __iomem *ioremap_fixed(phys_addr_t, unsigned long, pgprot_t);

int iounmap_fixed(void __iomem *);

void ioremap_fixed_init(void);

#else

static inline void __iomem *

ioremap_fixed(phys_addr_t phys_addr, unsigned long size, pgprot_t prot)

{

	BUG();

	return NULL;

}

static inline void ioremap_fixed_init(void)

{

}

static inline int iounmap_fixed(void __iomem *addr)

{

	return -EINVAL;

}

#endif /* CONFIG_IOREMAP_FIXED */

#endif /* _SH_MM_IORMEMAP_H */

arch/sh/mm/ioremap_fixed.c

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <asm/tlbflush.h>

#include <asm/mmu.h>

#include <asm/mmu_context.h>

#include "ioremap.h"



struct ioremap_map {

	void __iomem *addr;