From eaf5cf5a00d50d816062991f7b4ab39bc3b67caa Mon Sep 17 00:00:00 2001
From: "Kevin P. Fleming" <kpfleming@digium.com>
Date: Thu, 22 May 2008 12:37:03 +0000
Subject: and with another fell swoop... 2.4 kernel support is gone too

git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@4327 a0bf4364-ded3-4de4-8d8a-66a801d63aff
---
 drivers/dahdi/wcte11xp.c | 36 ++++--------------------------------
 1 file changed, 4 insertions(+), 32 deletions(-)

(limited to 'drivers/dahdi/wcte11xp.c')

diff --git a/drivers/dahdi/wcte11xp.c b/drivers/dahdi/wcte11xp.c
index ef2c6be..824e8e1 100644
--- a/drivers/dahdi/wcte11xp.c
+++ b/drivers/dahdi/wcte11xp.c
@@ -32,14 +32,11 @@
 #include <linux/errno.h>
 #include <linux/pci.h>
 #include <linux/spinlock.h>
+#include <linux/moduleparam.h>
 
 #include <dahdi/kernel.h>
 #include <dahdi/user.h>
 
-#ifdef LINUX26
-#include <linux/moduleparam.h>
-#endif
-
 /* XXX: fix this */
 #include "wct4xxp/wct4xxp.h"	/* For certain definitions */
 
@@ -235,11 +232,8 @@ static int t1xxp_open(struct dahdi_chan *chan)
 	if (wc->dead)
 		return -ENODEV;
 	wc->usecount++;
-#ifndef LINUX26	
-	MOD_INC_USE_COUNT;
-#else
 	try_module_get(THIS_MODULE);
-#endif	
+
 	return 0;
 }
 
@@ -356,12 +350,9 @@ static void t1xxp_release(struct t1 *wc)
 static int t1xxp_close(struct dahdi_chan *chan)
 {
 	struct t1 *wc = chan->pvt;
+
 	wc->usecount--;
-#ifndef LINUX26	
-	MOD_DEC_USE_COUNT;
-#else
 	module_put(THIS_MODULE);
-#endif
 	/* If we're dead, release us now */
 	if (!wc->usecount && wc->dead) 
 		t1xxp_release(wc);
@@ -1333,11 +1324,7 @@ DAHDI_IRQ_HANDLER(t1xxp_interrupt)
 
 	ints = inb(wc->ioaddr + WC_INTSTAT);
 	if (!ints)
-#ifdef LINUX26
 		return IRQ_NONE;
-#else
-		return;
-#endif		
 
 	outb(ints, wc->ioaddr + WC_INTSTAT);
 
@@ -1386,9 +1373,7 @@ DAHDI_IRQ_HANDLER(t1xxp_interrupt)
 	if (ints & 0x20)
 		printk("PCI Target abort\n");
 
-#ifdef LINUX26
 	return IRQ_RETVAL(1);
-#endif		
 }
 
 static int t1xxp_hardware_init(struct t1 *wc)
@@ -1596,11 +1581,7 @@ MODULE_DEVICE_TABLE(pci,t1xxp_pci_tbl);
 static struct pci_driver t1xxp_driver = {
 	name: 	"wcte11xp",
 	probe: 	t1xxp_init_one,
-#ifdef LINUX26
 	remove:	__devexit_p(t1xxp_remove_one),
-#else
-	remove:	t1xxp_remove_one,
-#endif
 	suspend: NULL,
 	resume:	NULL,
 	id_table: t1xxp_pci_tbl,
@@ -1620,7 +1601,6 @@ static void __exit t1xxp_cleanup(void)
 	pci_unregister_driver(&t1xxp_driver);
 }
 
-#ifdef LINUX26
 module_param(alarmdebounce, int, 0600);
 module_param(loopback, int, 0600);
 module_param(t1e1override, int, 0600);
@@ -1628,15 +1608,7 @@ module_param(unchannelized, int, 0600);
 module_param(clockextra, int, 0600);
 module_param(debug, int, 0600);
 module_param(j1mode, int, 0600);
-#else
-MODULE_PARM(alarmdebounce, "i");
-MODULE_PARM(loopback, "i");
-MODULE_PARM(t1e1override, "i");
-MODULE_PARM(unchannelized, "i");
-MODULE_PARM(clockextra, "i");
-MODULE_PARM(debug, "i");
-MODULE_PARM(j1mode, "i");
-#endif
+
 MODULE_DESCRIPTION("Wildcard TE110P DAHDI Driver");
 MODULE_AUTHOR("Mark Spencer <markster@digium.com>");
 #ifdef MODULE_LICENSE
-- 
cgit v1.2.3