From: Brian Gerst Drivers should all be converted to use ioremap() or isa_*() by now. --- /dev/null | 22 -------------------- 25-akpm/arch/i386/Kconfig | 11 ---------- 25-akpm/arch/i386/kernel/i386_ksyms.c | 4 --- 25-akpm/arch/i386/lib/Makefile | 1 25-akpm/arch/x86_64/kernel/x8664_ksyms.c | 4 --- 25-akpm/arch/x86_64/lib/Makefile | 1 25-akpm/arch/x86_64/lib/io.c | 4 +-- 25-akpm/include/asm-i386/io.h | 33 ++++++++++--------------------- 25-akpm/include/asm-x86_64/io.h | 33 ++++++++++--------------------- 9 files changed, 24 insertions(+), 89 deletions(-) diff -puN arch/i386/Kconfig~remove-__io_virt_debug arch/i386/Kconfig --- 25/arch/i386/Kconfig~remove-__io_virt_debug Thu Feb 26 13:50:57 2004 +++ 25-akpm/arch/i386/Kconfig Thu Feb 26 13:50:57 2004 @@ -1251,17 +1251,6 @@ config DEBUG_SLAB allocation as well as poisoning memory on free to catch use of freed memory. -config DEBUG_IOVIRT - bool "Memory mapped I/O debugging" - depends on DEBUG_KERNEL - help - Say Y here to get warned whenever an attempt is made to do I/O on - obviously invalid addresses such as those generated when ioremap() - calls are forgotten. Memory mapped I/O will go through an extra - check to catch access to unmapped ISA addresses, an access method - that can still be used by old drivers that are being ported from - 2.0/2.2. - config MAGIC_SYSRQ bool "Magic SysRq key" depends on DEBUG_KERNEL diff -puN arch/i386/kernel/i386_ksyms.c~remove-__io_virt_debug arch/i386/kernel/i386_ksyms.c --- 25/arch/i386/kernel/i386_ksyms.c~remove-__io_virt_debug Thu Feb 26 13:50:57 2004 +++ 25-akpm/arch/i386/kernel/i386_ksyms.c Thu Feb 26 13:50:57 2004 @@ -88,10 +88,6 @@ EXPORT_SYMBOL(get_cmos_time); EXPORT_SYMBOL(cpu_khz); EXPORT_SYMBOL(apm_info); -#ifdef CONFIG_DEBUG_IOVIRT -EXPORT_SYMBOL(__io_virt_debug); -#endif - EXPORT_SYMBOL_NOVERS(__down_failed); EXPORT_SYMBOL_NOVERS(__down_failed_interruptible); EXPORT_SYMBOL_NOVERS(__down_failed_trylock); diff -puN -L arch/i386/lib/iodebug.c arch/i386/lib/iodebug.c~remove-__io_virt_debug /dev/null --- 25/arch/i386/lib/iodebug.c +++ /dev/null Thu Apr 11 07:25:15 2002 @@ -1,11 +0,0 @@ -#include - -void * __io_virt_debug(unsigned long x, const char *file, int line) -{ - if (x < PAGE_OFFSET) { - printk("io mapaddr 0x%05lx not valid at %s:%d!\n", x, file, line); - return __va(x); - } - return (void *)x; -} - diff -puN arch/i386/lib/Makefile~remove-__io_virt_debug arch/i386/lib/Makefile --- 25/arch/i386/lib/Makefile~remove-__io_virt_debug Thu Feb 26 13:50:57 2004 +++ 25-akpm/arch/i386/lib/Makefile Thu Feb 26 13:50:57 2004 @@ -10,4 +10,3 @@ lib-y = checksum.o delay.o \ lib-$(CONFIG_X86_USE_3DNOW) += mmx.o lib-$(CONFIG_HAVE_DEC_LOCK) += dec_and_lock.o lib-$(CONFIG_KGDB) += kgdb_serial.o -lib-$(CONFIG_DEBUG_IOVIRT) += iodebug.o diff -puN arch/x86_64/kernel/x8664_ksyms.c~remove-__io_virt_debug arch/x86_64/kernel/x8664_ksyms.c --- 25/arch/x86_64/kernel/x8664_ksyms.c~remove-__io_virt_debug Thu Feb 26 13:50:57 2004 +++ 25-akpm/arch/x86_64/kernel/x8664_ksyms.c Thu Feb 26 13:50:57 2004 @@ -63,10 +63,6 @@ EXPORT_SYMBOL(pm_idle); EXPORT_SYMBOL(pm_power_off); EXPORT_SYMBOL(get_cmos_time); -#ifdef CONFIG_IO_DEBUG -EXPORT_SYMBOL(__io_virt_debug); -#endif - EXPORT_SYMBOL_NOVERS(__down_failed); EXPORT_SYMBOL_NOVERS(__down_failed_interruptible); EXPORT_SYMBOL_NOVERS(__down_failed_trylock); diff -puN arch/x86_64/lib/io.c~remove-__io_virt_debug arch/x86_64/lib/io.c --- 25/arch/x86_64/lib/io.c~remove-__io_virt_debug Thu Feb 26 13:50:57 2004 +++ 25-akpm/arch/x86_64/lib/io.c Thu Feb 26 13:50:57 2004 @@ -4,12 +4,12 @@ void *memcpy_toio(void *dst,const void*src,unsigned len) { - return __inline_memcpy(__io_virt(dst),src,len); + return __inline_memcpy(dst,src,len); } void *memcpy_fromio(void *dst,const void*src,unsigned len) { - return __inline_memcpy(dst,__io_virt(src),len); + return __inline_memcpy(dst,src,len); } EXPORT_SYMBOL(memcpy_toio); diff -puN -L arch/x86_64/lib/iodebug.c arch/x86_64/lib/iodebug.c~remove-__io_virt_debug /dev/null --- 25/arch/x86_64/lib/iodebug.c +++ /dev/null Thu Apr 11 07:25:15 2002 @@ -1,11 +0,0 @@ -#include - -void * __io_virt_debug(unsigned long x, const char *file, int line) -{ - if (x < PAGE_OFFSET) { - printk("io mapaddr 0x%05lx not valid at %s:%d!\n", x, file, line); - return __va(x); - } - return (void *)x; -} - diff -puN arch/x86_64/lib/Makefile~remove-__io_virt_debug arch/x86_64/lib/Makefile --- 25/arch/x86_64/lib/Makefile~remove-__io_virt_debug Thu Feb 26 13:50:57 2004 +++ 25-akpm/arch/x86_64/lib/Makefile Thu Feb 26 13:50:57 2004 @@ -9,6 +9,5 @@ lib-y := csum-partial.o csum-copy.o csum thunk.o io.o clear_page.o copy_page.o bitstr.o lib-y += memcpy.o memmove.o memset.o copy_user.o -lib-$(CONFIG_IO_DEBUG) += iodebug.o lib-$(CONFIG_HAVE_DEC_LOCK) += dec_and_lock.o lib-$(CONFIG_KGDB) += kgdb_serial.o diff -puN include/asm-i386/io.h~remove-__io_virt_debug include/asm-i386/io.h --- 25/include/asm-i386/io.h~remove-__io_virt_debug Thu Feb 26 13:50:57 2004 +++ 25-akpm/include/asm-i386/io.h Thu Feb 26 13:50:57 2004 @@ -45,17 +45,6 @@ #include -/* - * Temporary debugging check to catch old code using - * unmapped ISA addresses. Will be removed in 2.4. - */ -#ifdef CONFIG_DEBUG_IOVIRT - extern void *__io_virt_debug(unsigned long x, const char *file, int line); - #define __io_virt(x) __io_virt_debug((unsigned long)(x), __FILE__, __LINE__) -#else - #define __io_virt(x) ((void *)(x)) -#endif - /** * virt_to_phys - map virtual addresses to physical * @address: address to remap @@ -150,9 +139,9 @@ extern void bt_iounmap(void *addr, unsig * memory location directly. */ -#define readb(addr) (*(volatile unsigned char *) __io_virt(addr)) -#define readw(addr) (*(volatile unsigned short *) __io_virt(addr)) -#define readl(addr) (*(volatile unsigned int *) __io_virt(addr)) +#define readb(addr) (*(volatile unsigned char *) (addr)) +#define readw(addr) (*(volatile unsigned short *) (addr)) +#define readl(addr) (*(volatile unsigned int *) (addr)) #define readb_relaxed(addr) readb(addr) #define readw_relaxed(addr) readw(addr) #define readl_relaxed(addr) readl(addr) @@ -160,16 +149,16 @@ extern void bt_iounmap(void *addr, unsig #define __raw_readw readw #define __raw_readl readl -#define writeb(b,addr) (*(volatile unsigned char *) __io_virt(addr) = (b)) -#define writew(b,addr) (*(volatile unsigned short *) __io_virt(addr) = (b)) -#define writel(b,addr) (*(volatile unsigned int *) __io_virt(addr) = (b)) +#define writeb(b,addr) (*(volatile unsigned char *) (addr) = (b)) +#define writew(b,addr) (*(volatile unsigned short *) (addr) = (b)) +#define writel(b,addr) (*(volatile unsigned int *) (addr) = (b)) #define __raw_writeb writeb #define __raw_writew writew #define __raw_writel writel -#define memset_io(a,b,c) memset(__io_virt(a),(b),(c)) -#define memcpy_fromio(a,b,c) __memcpy((a),__io_virt(b),(c)) -#define memcpy_toio(a,b,c) __memcpy(__io_virt(a),(b),(c)) +#define memset_io(a,b,c) memset((void *)(a),(b),(c)) +#define memcpy_fromio(a,b,c) __memcpy((a),(void *)(b),(c)) +#define memcpy_toio(a,b,c) __memcpy((void *)(a),(b),(c)) /* * ISA space is 'always mapped' on a typical x86 system, no need to @@ -196,8 +185,8 @@ extern void bt_iounmap(void *addr, unsig * Again, i386 does not require mem IO specific function. */ -#define eth_io_copy_and_sum(a,b,c,d) eth_copy_and_sum((a),__io_virt(b),(c),(d)) -#define isa_eth_io_copy_and_sum(a,b,c,d) eth_copy_and_sum((a),__io_virt(__ISA_IO_base + (b)),(c),(d)) +#define eth_io_copy_and_sum(a,b,c,d) eth_copy_and_sum((a),(void *)(b),(c),(d)) +#define isa_eth_io_copy_and_sum(a,b,c,d) eth_copy_and_sum((a),(void *)(__ISA_IO_base + (b)),(c),(d)) /** * check_signature - find BIOS signatures diff -puN include/asm-x86_64/io.h~remove-__io_virt_debug include/asm-x86_64/io.h --- 25/include/asm-x86_64/io.h~remove-__io_virt_debug Thu Feb 26 13:50:57 2004 +++ 25-akpm/include/asm-x86_64/io.h Thu Feb 26 13:50:57 2004 @@ -109,17 +109,6 @@ __OUTS(l) #include -/* - * Temporary debugging check to catch old code using - * unmapped ISA addresses. Will be removed in 2.4. - */ -#ifdef CONFIG_IO_DEBUG - extern void *__io_virt_debug(unsigned long x, const char *file, int line); - #define __io_virt(x) __io_virt_debug((unsigned long)(x), __FILE__, __LINE__) -#else - #define __io_virt(x) ((void *)(x)) -#endif - #ifndef __i386__ /* * Change virtual addresses to physical addresses and vv. @@ -184,10 +173,10 @@ extern void iounmap(void *addr); * memory location directly. */ -#define readb(addr) (*(volatile unsigned char *) __io_virt(addr)) -#define readw(addr) (*(volatile unsigned short *) __io_virt(addr)) -#define readl(addr) (*(volatile unsigned int *) __io_virt(addr)) -#define readq(addr) (*(volatile unsigned long *) __io_virt(addr)) +#define readb(addr) (*(volatile unsigned char *) (addr)) +#define readw(addr) (*(volatile unsigned short *) (addr)) +#define readl(addr) (*(volatile unsigned int *) (addr)) +#define readq(addr) (*(volatile unsigned long *) (addr)) #define readb_relaxed(a) readb(a) #define readw_relaxed(a) readw(a) #define readl_relaxed(a) readl(a) @@ -197,10 +186,10 @@ extern void iounmap(void *addr); #define __raw_readl readl #define __raw_readq readq -#define writeb(b,addr) (*(volatile unsigned char *) __io_virt(addr) = (b)) -#define writew(b,addr) (*(volatile unsigned short *) __io_virt(addr) = (b)) -#define writel(b,addr) (*(volatile unsigned int *) __io_virt(addr) = (b)) -#define writeq(b,addr) (*(volatile unsigned long *) __io_virt(addr) = (b)) +#define writeb(b,addr) (*(volatile unsigned char *) (addr) = (b)) +#define writew(b,addr) (*(volatile unsigned short *) (addr) = (b)) +#define writel(b,addr) (*(volatile unsigned int *) (addr) = (b)) +#define writeq(b,addr) (*(volatile unsigned long *) (addr) = (b)) #define __raw_writeb writeb #define __raw_writew writew #define __raw_writel writel @@ -208,7 +197,7 @@ extern void iounmap(void *addr); void *memcpy_fromio(void*,const void*,unsigned); void *memcpy_toio(void*,const void*,unsigned); -#define memset_io(a,b,c) memset(__io_virt(a),(b),(c)) +#define memset_io(a,b,c) memset((void *)(a),(b),(c)) /* * ISA space is 'always mapped' on a typical x86 system, no need to @@ -235,8 +224,8 @@ void *memcpy_toio(void*,const void*,unsi * Again, x86-64 does not require mem IO specific function. */ -#define eth_io_copy_and_sum(a,b,c,d) eth_copy_and_sum((a),__io_virt(b),(c),(d)) -#define isa_eth_io_copy_and_sum(a,b,c,d) eth_copy_and_sum((a),__io_virt(__ISA_IO_base + (b)),(c),(d)) +#define eth_io_copy_and_sum(a,b,c,d) eth_copy_and_sum((a),(void *)(b),(c),(d)) +#define isa_eth_io_copy_and_sum(a,b,c,d) eth_copy_and_sum((a),(void *)(__ISA_IO_base + (b)),(c),(d)) /** * check_signature - find BIOS signatures _