[Pkg-voip-commits] r4699 - in /zaptel/trunk: cwain/cwain.c debian/patches/zaphfc-florz.dpatch qozap/qozap.c wcopenpci.c zaphfc/zaphfc.c ztgsm/ztgsm.c

[tzafrir-guest at alioth.debian.org]

Author: tzafrir-guest
Date: Sat Oct  6 23:11:06 2007
New Revision: 4699

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=4699
Log:
Fix compilation warning .

Modified:
    zaptel/trunk/cwain/cwain.c
    zaptel/trunk/debian/patches/zaphfc-florz.dpatch
    zaptel/trunk/qozap/qozap.c
    zaptel/trunk/wcopenpci.c
    zaptel/trunk/zaphfc/zaphfc.c
    zaptel/trunk/ztgsm/ztgsm.c

Modified: zaptel/trunk/cwain/cwain.c
URL: http://svn.debian.org/wsvn/pkg-voip/zaptel/trunk/cwain/cwain.c?rev=4699&op=diff
==============================================================================
--- zaptel/trunk/cwain/cwain.c (original)
+++ zaptel/trunk/cwain/cwain.c Sat Oct  6 23:11:06 2007
@@ -871,11 +871,7 @@
 }
 
 
-#ifdef LINUX26
-static irqreturn_t cwain_interrupt(int irq, void *dev_id, struct pt_regs *regs) {
-#else
-static void cwain_interrupt(int irq, void *dev_id, struct pt_regs *regs) {
-#endif
+ZAP_IRQ_HANDLER(cwain_interrupt) {
     struct zt_cwain_card *cwaintmp = dev_id;
     unsigned char status, status2, status_tmp, irq_misc, irq_misc2 = 0;
 #ifndef RELAXED_LOCKING    
@@ -1358,16 +1354,16 @@
     cwaintmp->irq = cwaintmp->span[0]->irq;
     
     if (cwaintmp->spans == 2) {
-	if (request_irq(cwaintmp->irq, cwain_interrupt, SA_INTERRUPT | SA_SHIRQ, "cwain2", cwaintmp)) {
+	if (request_irq(cwaintmp->irq, cwain_interrupt, ZAP_IRQ_SHARED_DISABLED, "cwain2", cwaintmp)) {
     	    printk(KERN_WARNING "cwain: unable to register irq\n");
 	    return -1;
 	}
-	if (request_irq(cwaintmp->span[1]->irq, cwain_dummy_interrupt, SA_INTERRUPT | SA_SHIRQ, "cwaindummy", cwaintmp)) {
+	if (request_irq(cwaintmp->span[1]->irq, cwain_dummy_interrupt, ZAP_IRQ_SHARED_DISABLED, "cwaindummy", cwaintmp)) {
     	    printk(KERN_WARNING "cwain: unable to register irq\n");
 	    return -1;
 	}
     } else {
-	if (request_irq(cwaintmp->irq, cwain_interrupt, SA_INTERRUPT | SA_SHIRQ, "cwain", cwaintmp)) {
+	if (request_irq(cwaintmp->irq, cwain_interrupt, ZAP_IRQ_SHARED_DISABLED, "cwain", cwaintmp)) {
     	    printk(KERN_WARNING "cwain: unable to register irq\n");
 	    return -1;
 	}

Modified: zaptel/trunk/debian/patches/zaphfc-florz.dpatch
URL: http://svn.debian.org/wsvn/pkg-voip/zaptel/trunk/debian/patches/zaphfc-florz.dpatch?rev=4699&op=diff
==============================================================================
--- zaptel/trunk/debian/patches/zaphfc-florz.dpatch (original)
+++ zaptel/trunk/debian/patches/zaphfc-florz.dpatch Sat Oct  6 23:11:06 2007
@@ -1007,7 +1007,7 @@
 -	/* we need no stinking irq */
 -	hfctmp->irq = 0;
 -#else
- 	if (request_irq(hfctmp->irq, &hfc_interrupt, SA_INTERRUPT | SA_SHIRQ, "zaphfc", hfctmp)) {
+ 	if (request_irq(hfctmp->irq, &hfc_interrupt, ZAP_IRQ_SHARED_DISABLED, "zaphfc", hfctmp)) {
  	    printk(KERN_WARNING "zaphfc: unable to register irq\n");
 -	    kfree(hfctmp->fifomem);
 -	    kfree(hfctmp);

Modified: zaptel/trunk/qozap/qozap.c
URL: http://svn.debian.org/wsvn/pkg-voip/zaptel/trunk/qozap/qozap.c?rev=4699&op=diff
==============================================================================
--- zaptel/trunk/qozap/qozap.c (original)
+++ zaptel/trunk/qozap/qozap.c Sat Oct  6 23:11:06 2007
@@ -1624,7 +1624,7 @@
 	    return -EIO;
 	}
 	
-	if (request_irq(qoztmp->irq, qoz_interrupt, SA_INTERRUPT | SA_SHIRQ, "qozap", qoztmp)) {
+	if (request_irq(qoztmp->irq, qoz_interrupt, ZAP_IRQ_SHARED_DISABLED, "qozap", qoztmp)) {
 	    printk(KERN_WARNING "qozap: unable to register irq\n");
 	    kfree(qoztmp);
 	    pci_disable_device(tmp);

Modified: zaptel/trunk/wcopenpci.c
URL: http://svn.debian.org/wsvn/pkg-voip/zaptel/trunk/wcopenpci.c?rev=4699&op=diff
==============================================================================
--- zaptel/trunk/wcopenpci.c (original)
+++ zaptel/trunk/wcopenpci.c Sat Oct  6 23:11:06 2007
@@ -2151,7 +2151,7 @@
 	/* Enable bus mastering */
 	pci_set_master(pdev);
 
-	if (request_irq(pdev->irq, openpci_isr, SA_SHIRQ, NAME, wc)) {
+	if (request_irq(pdev->irq, openpci_isr, ZAP_IRQ_SHARED, NAME, wc)) {
 		cardcrit(boardnum, "Cant get IRQ!");
 		failret = -EIO;
 		goto hell_5;

Modified: zaptel/trunk/zaphfc/zaphfc.c
URL: http://svn.debian.org/wsvn/pkg-voip/zaptel/trunk/zaphfc/zaphfc.c?rev=4699&op=diff
==============================================================================
--- zaptel/trunk/zaphfc/zaphfc.c (original)
+++ zaptel/trunk/zaphfc/zaphfc.c Sat Oct  6 23:11:06 2007
@@ -1006,7 +1006,7 @@
 	/* we need no stinking irq */
 	hfctmp->irq = 0;
 #else
-	if (request_irq(hfctmp->irq, &hfc_interrupt, SA_INTERRUPT | SA_SHIRQ, "zaphfc", hfctmp)) {
+	if (request_irq(hfctmp->irq, &hfc_interrupt, ZAP_IRQ_SHARED_DISABLED, "zaphfc", hfctmp)) {
 	    printk(KERN_WARNING "zaphfc: unable to register irq\n");
 	    kfree(hfctmp->fifomem);
 	    kfree(hfctmp);

Modified: zaptel/trunk/ztgsm/ztgsm.c
URL: http://svn.debian.org/wsvn/pkg-voip/zaptel/trunk/ztgsm/ztgsm.c?rev=4699&op=diff
==============================================================================
--- zaptel/trunk/ztgsm/ztgsm.c (original)
+++ zaptel/trunk/ztgsm/ztgsm.c Sat Oct  6 23:11:06 2007
@@ -1057,7 +1057,7 @@
 	    return -EIO;
 	}
 	
-	if (request_irq(gsmtmp->irq, ztgsm_interrupt, SA_INTERRUPT | SA_SHIRQ, "ztgsm", gsmtmp)) {
+	if (request_irq(gsmtmp->irq, ztgsm_interrupt, ZAP_IRQ_SHARED_DISABLED, "ztgsm", gsmtmp)) {
 	    printk(KERN_WARNING "ztgsm: unable to register irq\n");
 	    release_region(gsmtmp->ioport, 0x100);
 	    release_mem_region(gsmtmp->pci_io_phys, gsmtmp->iomem_size);