kill include/linux/compatmac.h
Subsystems (7)
PATCH 1/1 kill include/linux/compatmac.h
include/linux/compatmac.h is quite useless. The idea behind this file is IMHO not bad but it's too outdated to be useful.
The patch below removes compatmac.h and all #include's of it.
The only file using the #define's from compatmac.h was drivers/char/sx.c, the patch expands these #define's.
After this the only effect of compatmac.h was the #include of some other header files. The only file that actually needed such an #include was drivers/char/applicom.c that needed linux/version.h. This is resolved by removing some 2.2 compatibility code from applicom.c.
I've tested the compilation with 2.5.65.
diffstat output:
arch/i386/kernel/suspend.c | 1 arch/s390/mm/fault.c | 1 arch/x86_64/kernel/suspend.c | 1 drivers/acpi/processor.c | 1 drivers/char/applicom.c | 18 --- drivers/char/sx.c | 37 +++--- drivers/media/dvb/dvb-core/dvb_frontend.c | 1 drivers/serial/68360serial.c | 1 fs/nfsd/nfs4xdr.c | 1 include/linux/compatmac.h | 160 ------------------------------ include/linux/mtd/compatmac.h | 1 11 files changed, 22 insertions(+), 201 deletions(-)
cu
Adrian
arch/i386/kernel/suspend.c renamed from arch/i386/kernel/suspend.c.old +0 -1
@@ -16,7 +16,6 @@#include <linux/poll.h> #include <linux/delay.h> #include <linux/sysrq.h> -#include <linux/compatmac.h> #include <linux/proc_fs.h> #include <linux/irq.h> #include <linux/pm.h>
arch/x86_64/kernel/suspend.c renamed from arch/x86_64/kernel/suspend.c.old +0 -1
@@ -16,7 +16,6 @@#include <linux/poll.h> #include <linux/delay.h> #include <linux/sysrq.h> -#include <linux/compatmac.h> #include <linux/proc_fs.h> #include <linux/irq.h> #include <linux/pm.h>
arch/s390/mm/fault.c renamed from arch/s390/mm/fault.c.old +0 -1
@@ -22,7 +22,6 @@#include <linux/mm.h> #include <linux/smp.h> #include <linux/smp_lock.h> -#include <linux/compatmac.h> #include <linux/init.h> #include <linux/console.h> #include <linux/module.h>
drivers/media/dvb/dvb-core/dvb_frontend.c renamed from drivers/media/dvb/dvb-core/dvb_frontend.c.old +0 -1
@@ -27,7 +27,6 @@#include <linux/slab.h> #include <linux/poll.h> #include <linux/module.h> -#include <linux/compatmac.h> #include <linux/list.h> #include "compat.h"
drivers/acpi/processor.c renamed from drivers/acpi/processor.c.old +0 -1
@@ -36,7 +36,6 @@#include <linux/pci.h> #include <linux/pm.h> #include <linux/cpufreq.h> -#include <linux/compatmac.h> #include <linux/proc_fs.h> #include <linux/seq_file.h>
drivers/serial/68360serial.c renamed from drivers/serial/68360serial.c.old +0 -1
@@ -39,7 +39,6 @@#include <linux/init.h> #include <linux/delay.h> #include <asm/irq.h> -#include <linux/compatmac.h> #include <asm/m68360.h> #include <asm/commproc.h>
fs/nfsd/nfs4xdr.c renamed from fs/nfsd/nfs4xdr.c.old +0 -1
@@ -45,7 +45,6 @@#include <linux/param.h> #include <linux/smp.h> #include <linux/smp_lock.h> -#include <linux/compatmac.h> #include <linux/fs.h> #include <linux/namei.h> #include <linux/vfs.h>
include/linux/mtd/compatmac.h renamed from include/linux/mtd/compatmac.h.old +0 -1
@@ -17,7 +17,6 @@#ifndef __LINUX_MTD_COMPATMAC_H__#define __LINUX_MTD_COMPATMAC_H__ -#include <linux/compatmac.h> #include <linux/types.h> /* used later in this header */ #include <linux/module.h> #ifndef LINUX_VERSION_CODE
include/linux/compatmac.h deleted +0 -160
160 lines not on this page · raw message
drivers/char/sx.c renamed from drivers/char/sx.c.old +18 -19
@@ -238,7 +238,6 @@#include "sxboards.h" #include "sxwindow.h" -#include <linux/compatmac.h> #include <linux/generic_serial.h> #include "sx.h"
@@ -1726,9 +1725,9 @@ tmp =kmalloc (SX_CHUNK_SIZE ,GFP_USER );if (!tmp)return -ENOMEM ; -Get_user (nbytes, descr++); -Get_user (offset, descr++); -Get_user (data, descr++); +get_user (nbytes, descr++); +get_user (offset, descr++); +get_user (data, descr++);while (nbytes && data) {for (i=0 ;i<nbytes;i +=SX_CHUNK_SIZE ) { if (copy_from_user(tmp, (char *)data + i,
@@ -1740,9 +1739,9 @@ (i+SX_CHUNK_SIZE>nbytes)?nbytes-i:SX_CHUNK_SIZE); } -Get_user (nbytes, descr++); -Get_user (offset, descr++); -Get_user (data, descr++); +get_user (nbytes, descr++); +get_user (offset, descr++); +get_user (data, descr++); }kfree (tmp); sx_nports +=sx_init_board (board);
@@ -1816,13 +1815,13 @@ rc =0 ;switch (cmd) {case TIOCGSOFTCAR : - rc =Put_user (((tty->termios->c_cflag &CLOCAL ) ?1 :0 ), + rc =put_user (((tty->termios->c_cflag &CLOCAL ) ?1 :0 ), (unsigned int *) arg);break ;case TIOCSSOFTCAR :if ((rc =verify_area (VERIFY_READ , (void *) arg,sizeof (int ))) ==0 ) { -Get_user (ival, (unsigned int *) arg); +get_user (ival, (unsigned int *) arg); tty->termios->c_cflag = (tty->termios->c_cflag & ~CLOCAL ) | (ival ?CLOCAL :0 );
@@ -1848,7 +1847,7 @@case TIOCMBIS :if ((rc =verify_area (VERIFY_READ , (void *) arg,sizeof (unsigned int ))) ==0 ) { -Get_user (ival, (unsigned int *) arg); +get_user (ival, (unsigned int *) arg);sx_setsignals (port, ((ival &TIOCM_DTR ) ?1 :-1 ), ((ival &TIOCM_RTS ) ?1 :-1 ));sx_reconfigure_port (port);
@@ -1857,7 +1856,7 @@case TIOCMBIC :if ((rc =verify_area (VERIFY_READ , (void *) arg,sizeof (unsigned int ))) ==0 ) { -Get_user (ival, (unsigned int *) arg); +get_user (ival, (unsigned int *) arg);sx_setsignals (port, ((ival &TIOCM_DTR ) ?0 :-1 ), ((ival &TIOCM_RTS ) ?0 :-1 ));sx_reconfigure_port (port);
@@ -1866,7 +1865,7 @@case TIOCMSET :if ((rc =verify_area (VERIFY_READ , (void *) arg,sizeof (unsigned int ))) ==0 ) { -Get_user (ival, (unsigned int *) arg); +get_user (ival, (unsigned int *) arg);sx_setsignals (port, ((ival &TIOCM_DTR ) ?1 :0 ), ((ival &TIOCM_RTS ) ?1 :0 ));sx_reconfigure_port (port);
@@ -2484,7 +2483,7 @@printk (KERN_DEBUG "sx: performing cntrl reg fix: %08x -> %08x\n" , t,CNTRL_REG_GOODVALUE ); writel (CNTRL_REG_GOODVALUE, rebase + CNTRL_REG_OFFSET); } -my_iounmap (hwbase, rebase); +iounmap ((char *) rebase); }#endif
@@ -2574,7 +2573,7 @@0x18000 .... */ if (IS_CF_BOARD (board)) board->base +=0x18000 ; - board->irq =get_irq (pdev); + board->irq = pdev->irq;sx_dprintk (SX_DEBUG_PROBE ,"Got a specialix card: %x/%lx(%d) %x.\n" , tint, boards[found].base, board->irq, board->flags);
@@ -2583,7 +2582,7 @@ found++; fix_sx_pci (pdev, board); }else -my_iounmap (board->hw_base, board->base); +iounmap ((char *) (board->base)); } }#endif
@@ -2600,7 +2599,7 @@if (probe_sx (board)) { found++; }else { -my_iounmap (board->hw_base, board->base); +iounmap ((char *) (board->base)); } }
@@ -2616,7 +2615,7 @@if (probe_si (board)) { found++; }else { -my_iounmap (board->hw_base, board->base); +iounmap ((char *) (board->base)); } }for (i=0 ;i<NR_SI1_ADDRS ;i++) {
@@ -2631,7 +2630,7 @@if (probe_si (board)) { found++; }else { -my_iounmap (board->hw_base, board->base); +iounmap ((char *) (board->base)); } }
@@ -2692,7 +2691,7 @@/* It is safe/allowed to del_timer a non-active timer */ del_timer (& board->timer); -my_iounmap (board->hw_base, board->base); +iounmap ((char *) (board->base)); } }if (misc_deregister (&sx_fw_device) <0 ) {
drivers/char/applicom.c renamed from drivers/char/applicom.c.old +4 -14
@@ -29,22 +29,12 @@#include <linux/pci.h> #include <linux/wait.h> #include <linux/init.h> -#include <linux/compatmac.h> #include <asm/io.h> #include <asm/uaccess.h> #include "applicom.h" -#if LINUX_VERSION_CODE <0x20300 -/* These probably want adding to <linux/compatmac.h> */ -#define init_waitqueue_head (x) do { *(x) = NULL; } while (0) -#define PCI_BASE_ADDRESS (dev) (dev->base_address[0]) -#define DECLARE_WAIT_QUEUE_HEAD (x) struct wait_queue *x -#define __setup (x,y)/* */ -#else -#define PCI_BASE_ADDRESS (dev) (dev->resource[0].start) -#endif /* NOTE: We use for loops with {write,read}b() instead of memcpy_{from,to}io throughout this driver. This is because
@@ -220,18 +210,18 @@if (pci_enable_device (dev))return -EIO ; - RamIO =ioremap (PCI_BASE_ADDRESS (dev),LEN_RAM_IO ); + RamIO =ioremap (dev->resource[0 ].start,LEN_RAM_IO );if (!RamIO) { -printk (KERN_INFO "ac.o: Failed to ioremap PCI memory space at 0x%lx\n" ,PCI_BASE_ADDRESS (dev)); +printk (KERN_INFO "ac.o: Failed to ioremap PCI memory space at 0x%lx\n" , dev->resource[0 ].start);return -EIO ; }printk (KERN_INFO "Applicom %s found at mem 0x%lx, irq %d\n" , - applicom_pci_devnames[dev->device-1 ],PCI_BASE_ADDRESS (dev), + applicom_pci_devnames[dev->device-1 ], dev->resource[0 ].start, dev->irq); -if (!(boardno =ac_register_board (PCI_BASE_ADDRESS (dev), +if (!(boardno =ac_register_board (dev->resource[0 ].start, (unsigned long )RamIO,0 ))) {printk (KERN_INFO "ac.o: PCI Applicom device doesn't have correct signature.\n" );iounmap (RamIO);