Commit 133822c5 authored by Jeremy Fitzhardinge's avatar Jeremy Fitzhardinge
Browse files

x86: asm/io.h: unify ioremap prototypes 



Impact: unify identical code

asm/io_32.h and _64.h have identical prototypes for the ioremap family
of functions.  The 32-bit header had a more descriptive comment.

Signed-off-by: default avatarJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
parent 976e8f67

arch/x86/include/asm/io.h

+31 −0
Original line number Diff line number Diff line
@@ -138,6 +138,37 @@ static inline void *phys_to_virt(phys_addr_t address) 
#define virt_to_bus virt_to_phys

#define bus_to_virt phys_to_virt



/**

 * ioremap     -   map bus memory into CPU space

 * @offset:    bus address of the memory

 * @size:      size of the resource to map

 *

 * ioremap performs a platform specific sequence of operations to

 * make bus memory CPU accessible via the readb/readw/readl/writeb/

 * writew/writel functions and the other mmio helpers. The returned

 * address is not guaranteed to be usable directly as a virtual

 * address.

 *

 * If the area you are trying to map is a PCI BAR you should have a

 * look at pci_iomap().

 */

extern void __iomem *ioremap_nocache(resource_size_t offset, unsigned long size);

extern void __iomem *ioremap_cache(resource_size_t offset, unsigned long size);

extern void __iomem *ioremap_prot(resource_size_t offset, unsigned long size,

				unsigned long prot_val);



/*

 * The default ioremap() behavior is non-cached:

 */

static inline void __iomem *ioremap(resource_size_t offset, unsigned long size)

{

	return ioremap_nocache(offset, size);

}



extern void iounmap(volatile void __iomem *addr);



extern void __iomem *fix_ioremap(unsigned idx, unsigned long phys);





#ifdef CONFIG_X86_32

# include "io_32.h"

arch/x86/include/asm/io_32.h

+0 −29
Original line number Diff line number Diff line
@@ -53,35 +53,6 @@ 
 */

#define xlate_dev_kmem_ptr(p)	p



/**

 * ioremap     -   map bus memory into CPU space

 * @offset:    bus address of the memory

 * @size:      size of the resource to map

 *

 * ioremap performs a platform specific sequence of operations to

 * make bus memory CPU accessible via the readb/readw/readl/writeb/

 * writew/writel functions and the other mmio helpers. The returned

 * address is not guaranteed to be usable directly as a virtual

 * address.

 *

 * If the area you are trying to map is a PCI BAR you should have a

 * look at pci_iomap().

 */

extern void __iomem *ioremap_nocache(resource_size_t offset, unsigned long size);

extern void __iomem *ioremap_cache(resource_size_t offset, unsigned long size);

extern void __iomem *ioremap_prot(resource_size_t offset, unsigned long size,

				unsigned long prot_val);



/*

 * The default ioremap() behavior is non-cached:

 */

static inline void __iomem *ioremap(resource_size_t offset, unsigned long size)

{

	return ioremap_nocache(offset, size);

}



extern void iounmap(volatile void __iomem *addr);



static inline void

memset_io(volatile void __iomem *addr, unsigned char val, int count)

{

arch/x86/include/asm/io_64.h

+0 −22
Original line number Diff line number Diff line
@@ -144,28 +144,6 @@ __OUTS(l) 


#include <asm-generic/iomap.h>



/*

 * This one maps high address device memory and turns off caching for that area.

 * it's useful if some control registers are in such an area and write combining

 * or read caching is not desirable:

 */

extern void __iomem *ioremap_nocache(resource_size_t offset, unsigned long size);

extern void __iomem *ioremap_cache(resource_size_t offset, unsigned long size);

extern void __iomem *ioremap_prot(resource_size_t offset, unsigned long size,

				unsigned long prot_val);



/*

 * The default ioremap() behavior is non-cached:

 */

static inline void __iomem *ioremap(resource_size_t offset, unsigned long size)

{

	return ioremap_nocache(offset, size);

}



extern void iounmap(volatile void __iomem *addr);



extern void __iomem *fix_ioremap(unsigned idx, unsigned long phys);



void __memcpy_fromio(void *, unsigned long, unsigned);

void __memcpy_toio(unsigned long, const void *, unsigned);