summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorChas Williams <chas@cmf.nrl.navy.mil>2005-01-17 21:00:42 -0800
committerDavid S. Miller <davem@nuts.davemloft.net>2005-01-17 21:00:42 -0800
commitce3074f4f7cccf32aa82e2d1b70d234e221305dc (patch)
tree83b90c57f9b6bd8803dd1ebdc7006152bb79bbe5 /drivers
parentfc6a7f6dc0ccdeaa5141b5569cf9ff1e441f16d1 (diff)
[ATM]: [he] remove dead code and unneeded zero initializers
Signed-off-by: Marcel Sebek <sebek64@post.cz> Signed-off-by: Domen Puncer <domen@coderock.org> Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/atm/he.c37
1 files changed, 6 insertions, 31 deletions
diff --git a/drivers/atm/he.c b/drivers/atm/he.c
index 7221439b4937..e64d422470ff 100644
--- a/drivers/atm/he.c
+++ b/drivers/atm/he.c
@@ -86,44 +86,19 @@
#undef USE_RBPL_POOL /* if memory is tight try this */
#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
+/* #undef HE_DEBUG */
#include "he.h"
-
#include "suni.h"
-
#include <linux/atm_he.h>
#define hprintk(fmt,args...) printk(KERN_ERR DEV_LABEL "%d: " fmt, he_dev->number , ##args)
-#undef DEBUG
-#ifdef DEBUG
+#ifdef HE_DEBUG
#define HPRINTK(fmt,args...) printk(KERN_DEBUG DEV_LABEL "%d: " fmt, he_dev->number , ##args)
-#else
+#else /* !HE_DEBUG */
#define HPRINTK(fmt,args...) do { } while (0)
-#endif /* DEBUG */
-
+#endif /* HE_DEBUG */
/* version definition */
@@ -147,8 +122,8 @@ static u8 read_prom_byte(struct he_dev *he_dev, int addr);
/* globals */
-static struct he_dev *he_devs = NULL;
-static int disable64 = 0;
+static struct he_dev *he_devs;
+static int disable64;
static short nvpibits = -1;
static short nvcibits = -1;
static short rx_skb_reserve = 16;