diff options
author | Jeremy Fitzhardinge <jeremy@goop.org> | 2009-02-06 16:29:52 -0500 |
---|---|---|
committer | Jeremy Fitzhardinge <jeremy@goop.org> | 2009-02-06 16:29:52 -0500 |
commit | 133822c5c038b265ddb6545cda3a4c88815c7d3d (patch) | |
tree | daa2e77d813a26e5199285dc60dabd3baeeeb0ae /arch/x86/include/asm/io_32.h | |
parent | 976e8f677e42757e5586ea04a9ac8bb8ddaa037e (diff) |
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: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Diffstat (limited to 'arch/x86/include/asm/io_32.h')
-rw-r--r-- | arch/x86/include/asm/io_32.h | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/arch/x86/include/asm/io_32.h b/arch/x86/include/asm/io_32.h index 2b687cb86093..2fbe7dd26bb8 100644 --- a/arch/x86/include/asm/io_32.h +++ b/arch/x86/include/asm/io_32.h | |||
@@ -53,35 +53,6 @@ | |||
53 | */ | 53 | */ |
54 | #define xlate_dev_kmem_ptr(p) p | 54 | #define xlate_dev_kmem_ptr(p) p |
55 | 55 | ||
56 | /** | ||
57 | * ioremap - map bus memory into CPU space | ||
58 | * @offset: bus address of the memory | ||
59 | * @size: size of the resource to map | ||
60 | * | ||
61 | * ioremap performs a platform specific sequence of operations to | ||
62 | * make bus memory CPU accessible via the readb/readw/readl/writeb/ | ||
63 | * writew/writel functions and the other mmio helpers. The returned | ||
64 | * address is not guaranteed to be usable directly as a virtual | ||
65 | * address. | ||
66 | * | ||
67 | * If the area you are trying to map is a PCI BAR you should have a | ||
68 | * look at pci_iomap(). | ||
69 | */ | ||
70 | extern void __iomem *ioremap_nocache(resource_size_t offset, unsigned long size); | ||
71 | extern void __iomem *ioremap_cache(resource_size_t offset, unsigned long size); | ||
72 | extern void __iomem *ioremap_prot(resource_size_t offset, unsigned long size, | ||
73 | unsigned long prot_val); | ||
74 | |||
75 | /* | ||
76 | * The default ioremap() behavior is non-cached: | ||
77 | */ | ||
78 | static inline void __iomem *ioremap(resource_size_t offset, unsigned long size) | ||
79 | { | ||
80 | return ioremap_nocache(offset, size); | ||
81 | } | ||
82 | |||
83 | extern void iounmap(volatile void __iomem *addr); | ||
84 | |||
85 | static inline void | 56 | static inline void |
86 | memset_io(volatile void __iomem *addr, unsigned char val, int count) | 57 | memset_io(volatile void __iomem *addr, unsigned char val, int count) |
87 | { | 58 | { |