This patch removes dead code from drivers/atm/he.c, replaces custom debug printk with pr_debug and removes unneeded zero initializers. Compile tested. Signed-off-by: Marcel Sebek Signed-off-by: Domen Puncer --- kj-domen/drivers/atm/he.c | 35 ++++------------------------------- 1 files changed, 4 insertions(+), 31 deletions(-) diff -puN drivers/atm/he.c~cleanup-drivers_atm_he.c drivers/atm/he.c --- kj/drivers/atm/he.c~cleanup-drivers_atm_he.c 2004-12-25 01:36:06.000000000 +0100 +++ kj-domen/drivers/atm/he.c 2004-12-25 01:36:06.000000000 +0100 @@ -87,28 +87,6 @@ #define USE_TPD_POOL /* #undef CONFIG_ATM_HE_USE_SUNI */ -/* compatibility */ - -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,69) -typedef void irqreturn_t; -#define IRQ_NONE -#define IRQ_HANDLED -#define IRQ_RETVAL(x) -#endif - -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,9) -#define __devexit_p(func) func -#endif - -#ifndef MODULE_LICENSE -#define MODULE_LICENSE(x) -#endif - -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,3) -#define pci_set_drvdata(pci_dev, data) (pci_dev)->driver_data = (data) -#define pci_get_drvdata(pci_dev) (pci_dev)->driver_data -#endif - #include "he.h" #include "suni.h" @@ -117,12 +95,7 @@ typedef void irqreturn_t; #define hprintk(fmt,args...) printk(KERN_ERR DEV_LABEL "%d: " fmt, he_dev->number , ##args) -#undef DEBUG -#ifdef DEBUG -#define HPRINTK(fmt,args...) printk(KERN_DEBUG DEV_LABEL "%d: " fmt, he_dev->number , ##args) -#else -#define HPRINTK(fmt,args...) do { } while (0) -#endif /* DEBUG */ +#define HPRINTK(fmt,args...) pr_debug(DEV_LABEL "%d: " fmt, he_dev->number , ##args) /* version definition */ @@ -147,13 +120,13 @@ static u8 read_prom_byte(struct he_dev * /* globals */ -struct he_dev *he_devs = NULL; -static int disable64 = 0; +struct he_dev *he_devs; +static int disable64; static short nvpibits = -1; static short nvcibits = -1; static short rx_skb_reserve = 16; static int irq_coalesce = 1; -static int sdh = 0; +static int sdh; static struct atmdev_ops he_ops = { _