update to 2.6.22 request_irq() flags

git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.2@2756 5390a7c7-147a-4af0-8ec9-7488f05a26cb

13 files changed, 24 insertions, 14 deletions

diff --git a/pciradio.c b/pciradio.c
index 9c37800..ad425b1 100644
--- a/pciradio.c
+++ b/pciradio.c
@@ -1711,7 +1711,7 @@ static int __devinit pciradio_init_one(struct pci_dev *pdev, const struct pci_de
 
 			}
 
-			if (request_irq(pdev->irq, pciradio_interrupt, SA_SHIRQ, "pciradio", rad)) {
+			if (request_irq(pdev->irq, pciradio_interrupt, ZAP_IRQ_SHARED, "pciradio", rad)) {
 				printk("pciradio: Unable to request IRQ %d\n", pdev->irq);
 				if (rad->freeregion)
 					release_region(rad->ioaddr, 0xff);
diff --git a/tor2.c b/tor2.c
index 0ca35ee..f8b8fa0 100644
--- a/tor2.c
+++ b/tor2.c
@@ -534,7 +534,7 @@ static int __devinit tor2_probe(struct pci_dev *pdev, const struct pci_device_id
 	for (x = 0; x < 256; x++) tor->mem32[x] = 0x7f7f7f7f;
 
 
-	if (request_irq(tor->irq, tor2_intr, SA_INTERRUPT | SA_SHIRQ, "tor2", tor)) {
+	if (request_irq(tor->irq, tor2_intr, ZAP_IRQ_SHARED_DISABLED, "tor2", tor)) {
 		printk(KERN_ERR "Unable to request tormenta IRQ %d\n", tor->irq);
 		goto err_out_release_all;
 	}
diff --git a/torisa.c b/torisa.c
index 155743f..7027407 100644
--- a/torisa.c
+++ b/torisa.c
@@ -1070,7 +1070,7 @@ static int __init tor_init(void)
 		printk(KERN_ERR "No ISA tormenta card found at %05lx\n", base);
 		return -EIO;
 	}
-	if (request_irq(irq, torisa_intr, SA_INTERRUPT, "torisa", NULL)) {
+	if (request_irq(irq, torisa_intr, ZAP_IRQ_DISABLED, "torisa", NULL)) {
 		printk(KERN_ERR "Unable to request tormenta IRQ %d\n", irq);
 		return -EIO;
 	}
diff --git a/wcfxo.c b/wcfxo.c
index 77012a7..0d8f15e 100644
--- a/wcfxo.c
+++ b/wcfxo.c
@@ -895,7 +895,7 @@ static int __devinit wcfxo_init_one(struct pci_dev *pdev, const struct pci_devic
 			/* Keep track of which device we are */
 			pci_set_drvdata(pdev, wc);
 
-			if (request_irq(pdev->irq, wcfxo_interrupt, SA_SHIRQ, "wcfxo", wc)) {
+			if (request_irq(pdev->irq, wcfxo_interrupt, ZAP_IRQ_SHARED, "wcfxo", wc)) {
 				printk("wcfxo: Unable to request IRQ %d\n", pdev->irq);
 				if (wc->freeregion)
 					release_region(wc->ioaddr, 0xff);
diff --git a/wct1xxp.c b/wct1xxp.c
index 9d265d5..d383cd2 100644
--- a/wct1xxp.c
+++ b/wct1xxp.c
@@ -1318,7 +1318,7 @@ static int __devinit t1xxp_init_one(struct pci_dev *pdev, const struct pci_devic
 			/* Keep track of which device we are */
 			pci_set_drvdata(pdev, wc);
 
-			if (request_irq(pdev->irq, t1xxp_interrupt, SA_INTERRUPT | SA_SHIRQ, "t1xxp", wc)) {
+			if (request_irq(pdev->irq, t1xxp_interrupt, ZAP_IRQ_SHARED_DISABLED, "t1xxp", wc)) {
 				printk("t1xxp: Unable to request IRQ %d\n", pdev->irq);
 				kfree(wc);
 				return -EIO;
diff --git a/wct4xxp/base.c b/wct4xxp/base.c
index 0cb69dd..68247c6 100644
--- a/wct4xxp/base.c
+++ b/wct4xxp/base.c
@@ -3249,14 +3249,14 @@ static int __devinit t4_init_one(struct pci_dev *pdev, const struct pci_device_i
 
 
 #ifdef SUPPORT_GEN1
-			if (request_irq(pdev->irq, (dt->flags & FLAG_2NDGEN) ? t4_interrupt_gen2 :t4_interrupt, SA_INTERRUPT | SA_SHIRQ, (wc->numspans == 2) ? "wct2xxp" : "wct4xxp", wc)) 
+			if (request_irq(pdev->irq, (dt->flags & FLAG_2NDGEN) ? t4_interrupt_gen2 :t4_interrupt, ZAP_IRQ_SHARED_DISABLED, (wc->numspans == 2) ? "wct2xxp" : "wct4xxp", wc)) 
 #else
 			if (!(wc->tspans[0]->spanflags & FLAG_2NDGEN)) {
 				printk("This driver does not support 1st gen modules\n");
 				kfree(wc);
 				return -ENODEV;
 			}	
-			if (request_irq(pdev->irq, t4_interrupt_gen2, SA_INTERRUPT | SA_SHIRQ, "t4xxp", wc)) 
+			if (request_irq(pdev->irq, t4_interrupt_gen2, ZAP_IRQ_SHARED_DISABLED, "t4xxp", wc)) 
 #endif
 			{
 				printk("t4xxp: Unable to request IRQ %d\n", pdev->irq);
diff --git a/wctc4xxp/base.c b/wctc4xxp/base.c
index ea7bf70..42727d7 100644
--- a/wctc4xxp/base.c
+++ b/wctc4xxp/base.c
@@ -1688,7 +1688,7 @@ static int __devinit wcdte_init_one(struct pci_dev *pdev, const struct pci_devic
 			/* Keep track of which device we are */
 			pci_set_drvdata(pdev, wc);
 
-			if (request_irq(pdev->irq, wcdte_interrupt, SA_SHIRQ, "tc400b", wc)) {
+			if (request_irq(pdev->irq, wcdte_interrupt, ZAP_IRQ_SHARED, "tc400b", wc)) {
 				printk("wcdte error: Unable to request IRQ %d\n", pdev->irq);
 				if (wc->freeregion)
 					release_region(wc->iobase, 0xff);
diff --git a/wctdm.c b/wctdm.c
index 13346ab..854c529 100644
--- a/wctdm.c
+++ b/wctdm.c
@@ -2236,7 +2236,7 @@ static int __devinit wctdm_init_one(struct pci_dev *pdev, const struct pci_devic
 			/* Keep track of which device we are */
 			pci_set_drvdata(pdev, wc);
 
-			if (request_irq(pdev->irq, wctdm_interrupt, SA_SHIRQ, "wctdm", wc)) {
+			if (request_irq(pdev->irq, wctdm_interrupt, ZAP_IRQ_SHARED, "wctdm", wc)) {
 				printk("wctdm: Unable to request IRQ %d\n", pdev->irq);
 				if (wc->freeregion)
 					release_region(wc->ioaddr, 0xff);
diff --git a/wctdm24xxp.c b/wctdm24xxp.c
index eb02c9f..40af47b 100644
--- a/wctdm24xxp.c
+++ b/wctdm24xxp.c
@@ -2781,7 +2781,7 @@ static int __devinit wctdm_init_one(struct pci_dev *pdev, const struct pci_devic
 			/* Keep track of which device we are */
 			pci_set_drvdata(pdev, wc);
 
-			if (request_irq(pdev->irq, wctdm_interrupt, SA_SHIRQ, wc->variety, wc)) {
+			if (request_irq(pdev->irq, wctdm_interrupt, ZAP_IRQ_SHARED, wc->variety, wc)) {
 				printk("wctdm24xxp: Unable to request IRQ %d\n", pdev->irq);
 				if (wc->freeregion)
 					release_region(wc->iobase, 0xff);
diff --git a/wcte11xp.c b/wcte11xp.c
index f64e447..8765caf 100644
--- a/wcte11xp.c
+++ b/wcte11xp.c
@@ -1492,7 +1492,7 @@ static int __devinit t1xxp_init_one(struct pci_dev *pdev, const struct pci_devic
 			/* Keep track of which device we are */
 			pci_set_drvdata(pdev, wc);
 
-			if (request_irq(pdev->irq, t1xxp_interrupt, SA_INTERRUPT | SA_SHIRQ, "wcte11xp", wc)) {
+			if (request_irq(pdev->irq, t1xxp_interrupt, ZAP_IRQ_SHARED_DISABLED, "wcte11xp", wc)) {
 				printk("wcte11xp: Unable to request IRQ %d\n", pdev->irq);
 				kfree(wc);
 				return -EIO;
diff --git a/wcte12xp.c b/wcte12xp.c
index 2c7df0f..74b7056 100644
--- a/wcte12xp.c
+++ b/wcte12xp.c
@@ -1927,7 +1927,7 @@ static int __devinit te12xp_init_one(struct pci_dev *pdev, const struct pci_devi
 	/* Keep track of which device we are */
 	pci_set_drvdata(pdev, wc);
 	
-	if (request_irq(pdev->irq, te12xp_interrupt, SA_SHIRQ, te12xp_driver.name, wc)) {
+	if (request_irq(pdev->irq, te12xp_interrupt, ZAP_IRQ_SHARED, te12xp_driver.name, wc)) {
 		module_printk("Unable to request IRQ %d\n", pdev->irq);
 		if (wc->freeregion)
 			release_region(wc->iobase, 0xff);
diff --git a/zaptel.h b/zaptel.h
index b072d75..da5f481 100644
--- a/zaptel.h
+++ b/zaptel.h
@@ -70,6 +70,16 @@
 #define ZAP_IRQ_HANDLER(a) static void a(int irq, void *dev_id, struct pt_regs *regs)
 #endif
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)
+#define ZAP_IRQ_SHARED IRQF_SHARED
+#define ZAP_IRQ_DISABLED IRQF_DISABLED
+#define ZAP_IRQ_SHARED_DISABLED IRQF_SHARED | IRQF_DISABLED
+#else
+#define ZAP_IRQ_SHARED SA_SHIRQ
+#define ZAP_IRQ_DISABLED SA_INTERRUPT
+#define ZAP_IRQ_SHARED_DISABLED SA_SHIRQ | SA_INTERRUPT
+#endif
+
 #include "ecdis.h"
 #include "fasthdlc.h"
 #endif /* __KERNEL__ */
diff --git a/ztdummy.c b/ztdummy.c
index df2f19b..e4f0952 100644
--- a/ztdummy.c
+++ b/ztdummy.c
@@ -265,13 +265,13 @@ int init_module(void)
     irq=s->irq;
     spin_lock_irq(&mylock);
     free_irq(s->irq, s);	/* remove uhci_interrupt temporaly */
-    if (request_irq (irq, ztdummy_interrupt, SA_SHIRQ, "ztdummy", ztd)) {
+    if (request_irq (irq, ztdummy_interrupt, ZAP_IRQ_SHARED, "ztdummy", ztd)) {
     	spin_unlock_irq(&mylock);
 		err("Our request_irq %d failed!",irq);
 		kfree(ztd);
 		return -EIO;
     }		/* we add our handler first, to assure, that our handler gets called first */
-    if (request_irq (irq, uhci_interrupt, SA_SHIRQ, s->uhci_pci->driver->name, s)) {
+    if (request_irq (irq, uhci_interrupt, ZAP_IRQ_SHARED, s->uhci_pci->driver->name, s)) {
         spin_unlock_irq(&mylock);
 		err("Original request_irq %d failed!",irq);
     }