diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2008-01-30 15:34:06 +0300 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 15:34:06 +0300 |
commit | 5f8681529cb243b3a492e55f2da9d632ad0d5e32 (patch) | |
tree | 8ea316c39d508e828749f5a54c6d0fa66859b6a5 /include/asm-x86 | |
parent | 266b9f8727976769e2ed2dad77ac9295f37e321e (diff) | |
download | linux-5f8681529cb243b3a492e55f2da9d632ad0d5e32.tar.xz |
x86: fix ioremap API
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include/asm-x86')
-rw-r--r-- | include/asm-x86/io_32.h | 13 | ||||
-rw-r--r-- | include/asm-x86/io_64.h | 13 |
2 files changed, 6 insertions, 20 deletions
diff --git a/include/asm-x86/io_32.h b/include/asm-x86/io_32.h index 059a1fee4de3..586d7aa54ceb 100644 --- a/include/asm-x86/io_32.h +++ b/include/asm-x86/io_32.h @@ -100,8 +100,6 @@ static inline void * phys_to_virt(unsigned long address) */ #define page_to_phys(page) ((dma_addr_t)page_to_pfn(page) << PAGE_SHIFT) -extern void __iomem * __ioremap(unsigned long offset, unsigned long size, unsigned long flags); - /** * ioremap - map bus memory into CPU space * @offset: bus address of the memory @@ -116,18 +114,13 @@ extern void __iomem * __ioremap(unsigned long offset, unsigned long size, unsign * 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(unsigned long offset, unsigned long size); - -static inline void __iomem * -ioremap_cache(unsigned long offset, unsigned long size) -{ - return __ioremap(offset, size, 0); -} +extern void __iomem *ioremap_nocache(unsigned long offset, unsigned long size); +extern void __iomem *ioremap_cache(unsigned long offset, unsigned long size); /* * The default ioremap() behavior is non-cached: */ -static inline void __iomem * ioremap(unsigned long offset, unsigned long size) +static inline void __iomem *ioremap(unsigned long offset, unsigned long size) { return ioremap_nocache(offset, size); } diff --git a/include/asm-x86/io_64.h b/include/asm-x86/io_64.h index 7dee3c6e9c39..ee7a5c955962 100644 --- a/include/asm-x86/io_64.h +++ b/include/asm-x86/io_64.h @@ -150,8 +150,6 @@ static inline void * phys_to_virt(unsigned long address) #include <asm-generic/iomap.h> -extern void __iomem *__ioremap(unsigned long offset, unsigned long size, unsigned long flags); - extern void *early_ioremap(unsigned long addr, unsigned long size); extern void early_iounmap(void *addr, unsigned long size); @@ -160,18 +158,13 @@ extern void early_iounmap(void *addr, unsigned long size); * 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(unsigned long offset, unsigned long size); - -static inline void __iomem * -ioremap_cache(unsigned long offset, unsigned long size) -{ - return __ioremap(offset, size, 0); -} +extern void __iomem *ioremap_nocache(unsigned long offset, unsigned long size); +extern void __iomem *ioremap_cache(unsigned long offset, unsigned long size); /* * The default ioremap() behavior is non-cached: */ -static inline void __iomem * ioremap(unsigned long offset, unsigned long size) +static inline void __iomem *ioremap(unsigned long offset, unsigned long size) { return ioremap_cache(offset, size); } |