dmi: Clean-up dmi helper declarations
PATCH 1/1 dmi: Clean-up dmi helper declarations
The declaration of dmi helper functions is a bit messy and inconsistent at the moment:
* On ia64 they are declared in <asm/io.h>.
* On x86-64 they are declared in <asm/dmi.h>.
* On i386 they are declared both in <asm/io.h> and <asm/dmi.h>.
Fix the header files so that the dmi helper functions are consistently defined in <asm/dmi.h>.
Signed-off-by Jean Delvare <[email protected]>
Cc Matt Domsch <[email protected]>
---
Only tested on i386 and x86-64, maybe Matt can test on ia64?
include/asm-ia64/dmi.h | 5 +++++ include/asm-ia64/io.h | 5 ----- include/asm-x86/dmi.h | 1 + include/asm-x86/io_32.h | 5 ----- 4 files changed, 6 insertions(+), 10 deletions(-)
include/asm-ia64/dmi.h +5 -0
@@ -3,4 +3,9 @@#include <asm/io.h> +/* Use normal IO mappings for DMI */ +#define dmi_ioremap ioremap +#define dmi_iounmap (x,l) iounmap(x) +#define dmi_alloc (l) kmalloc(l, GFP_ATOMIC) +#endif
include/asm-ia64/io.h +0 -5
@@ -423,11 +423,6 @@ extern void __iomem * ioremap(unsigned lextern void __iomem *ioremap_nocache (unsigned long offset,unsigned long size);extern void iounmap (volatile void __iomem *addr); -/* Use normal IO mappings for DMI */ -#define dmi_ioremap ioremap -#define dmi_iounmap (x,l) iounmap(x) -#define dmi_alloc (l) kmalloc(l, GFP_ATOMIC) -/* * String version of IO memory access ops: */
include/asm-x86/dmi.h +1 -0
@@ -27,6 +27,7 @@ static inline void *dmi_alloc(unsigned l#endif +/* Use early IO mappings for DMI because it's initialized early */ #define dmi_ioremap early_ioremap#define dmi_iounmap early_iounmap
include/asm-x86/io_32.h +0 -5
@@ -139,11 +139,6 @@ extern void *early_ioremap(unsigned longextern void early_iounmap (void *addr,unsigned long size);extern void __iomem *fix_ioremap (unsigned idx,unsigned long phys); -/* Use early IO mappings for DMI because it's initialized early */ -#define dmi_ioremap early_ioremap -#define dmi_iounmap early_iounmap -#define dmi_alloc alloc_bootmem -/* * ISA I/O bus memory addresses are 1:1 with the physical address. */
Signature · 1 line
Jean Delvare