[PATCH] irq-flags: isdn: Use the new IRQF_ constants

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Karsten Keil <kkeil@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

18 files changed, 30 insertions, 30 deletions

diff --git a/drivers/isdn/hisax/avm_a1p.c b/drivers/isdn/hisax/avm_a1p.c
index d643bb32ad09..574e252dfa43 100644
--- a/drivers/isdn/hisax/avm_a1p.c
+++ b/drivers/isdn/hisax/avm_a1p.c
@@ -255,7 +255,7 @@ setup_avm_a1_pcmcia(struct IsdnCard *card)
         cs->BC_Write_Reg = &WriteHSCX;
         cs->BC_Send_Data = &hscx_fill_fifo;
         cs->cardmsg = &AVM_card_msg;
-        cs->irq_flags = SA_SHIRQ;
+        cs->irq_flags = IRQF_SHARED;
         cs->irq_func = &avm_a1p_interrupt;
 
         ISACVersion(cs, "AVM A1 PCMCIA:");
diff --git a/drivers/isdn/hisax/avm_pci.c b/drivers/isdn/hisax/avm_pci.c
index 93f3a5343a74..04f5917bf5a1 100644
--- a/drivers/isdn/hisax/avm_pci.c
+++ b/drivers/isdn/hisax/avm_pci.c
@@ -808,7 +808,7 @@ setup_avm_pcipnp(struct IsdnCard *card)
                 printk(KERN_WARNING "FritzPCI: No PCI card found\n");
                 return(0);
         }
-        cs->irq_flags |= SA_SHIRQ;
+        cs->irq_flags |= IRQF_SHARED;
 #else
         printk(KERN_WARNING "FritzPCI: NO_PCI_BIOS\n");
         return (0);
diff --git a/drivers/isdn/hisax/bkm_a4t.c b/drivers/isdn/hisax/bkm_a4t.c
index de28cb54817d..3cf1f2421789 100644
--- a/drivers/isdn/hisax/bkm_a4t.c
+++ b/drivers/isdn/hisax/bkm_a4t.c
@@ -335,7 +335,7 @@ setup_bkm_a4t(struct IsdnCard *card)
         cs->BC_Send_Data = &jade_fill_fifo;
         cs->cardmsg = &BKM_card_msg;
         cs->irq_func = &bkm_interrupt;
-        cs->irq_flags |= SA_SHIRQ;
+        cs->irq_flags |= IRQF_SHARED;
         ISACVersion(cs, "Telekom A4T:");
         /* Jade version */
         JadeVersion(cs, "Telekom A4T:");
diff --git a/drivers/isdn/hisax/bkm_a8.c b/drivers/isdn/hisax/bkm_a8.c
index 9d1abfb93dde..15681f3e73b8 100644
--- a/drivers/isdn/hisax/bkm_a8.c
+++ b/drivers/isdn/hisax/bkm_a8.c
@@ -374,7 +374,7 @@ setup_sct_quadro(struct IsdnCard *card)
         pci_ioaddr5 &= PCI_BASE_ADDRESS_IO_MASK;
         /* Take over */
         cs->irq = pci_irq;
-        cs->irq_flags |= SA_SHIRQ;
+        cs->irq_flags |= IRQF_SHARED;
         /* pci_ioaddr1 is unique to all subdevices */
         /* pci_ioaddr2 is for the fourth subdevice only */
         /* pci_ioaddr3 is for the third subdevice only */
diff --git a/drivers/isdn/hisax/diva.c b/drivers/isdn/hisax/diva.c
index fbb9d02e3e29..323a02ef3844 100644
--- a/drivers/isdn/hisax/diva.c
+++ b/drivers/isdn/hisax/diva.c
@@ -1076,7 +1076,7 @@ setup_diva(struct IsdnCard *card)
                         printk(KERN_WARNING "Diva: No IO-Adr for PCI card found\n");
                         return(0);
                 }
-                cs->irq_flags |= SA_SHIRQ;
+                cs->irq_flags |= IRQF_SHARED;
 #else
                 printk(KERN_WARNING "Diva: cfgreg 0 and NO_PCI_BIOS\n");
                 printk(KERN_WARNING "Diva: unable to config DIVA PCI\n");
diff --git a/drivers/isdn/hisax/elsa.c b/drivers/isdn/hisax/elsa.c
index 7a5cdb1dee1e..3b3e318f6076 100644
--- a/drivers/isdn/hisax/elsa.c
+++ b/drivers/isdn/hisax/elsa.c
@@ -85,8 +85,8 @@ static const char *ITACVer[] =
  ***                                                                    ***/
 
 /* Config-Register (Read) */
-#define ELSA_TIMER_RUN       0x02       /* Bit 1 des Config-Reg     */
-#define ELSA_TIMER_RUN_PCC8  0x01       /* Bit 0 des Config-Reg  bei PCC */
+#define ELIRQF_TIMER_RUN       0x02     /* Bit 1 des Config-Reg     */
+#define ELIRQF_TIMER_RUN_PCC8  0x01     /* Bit 0 des Config-Reg  bei PCC */
 #define ELSA_IRQ_IDX       0x38 /* Bit 3,4,5 des Config-Reg */
 #define ELSA_IRQ_IDX_PCC8  0x30 /* Bit 4,5 des Config-Reg */
 #define ELSA_IRQ_IDX_PC    0x0c /* Bit 2,3 des Config-Reg */
@@ -102,7 +102,7 @@ static const char *ITACVer[] =
 #define ELSA_S0_POWER_BAD    0x08       /* Bit 3 S0-Bus Spannung fehlt */
 
 /* Status Flags */
-#define ELSA_TIMER_AKTIV 1
+#define ELIRQF_TIMER_AKTIV 1
 #define ELSA_BAD_PWR     2
 #define ELSA_ASSIGN      4
 
@@ -259,10 +259,10 @@ TimerRun(struct IsdnCardState *cs)
 
         v = bytein(cs->hw.elsa.cfg);
         if ((cs->subtyp == ELSA_QS1000) || (cs->subtyp == ELSA_QS3000))
-                return (0 == (v & ELSA_TIMER_RUN));
+                return (0 == (v & ELIRQF_TIMER_RUN));
         else if (cs->subtyp == ELSA_PCC8)
-                return (v & ELSA_TIMER_RUN_PCC8);
-        return (v & ELSA_TIMER_RUN);
+                return (v & ELIRQF_TIMER_RUN_PCC8);
+        return (v & ELIRQF_TIMER_RUN);
 }
 /*
  * fast interrupt HSCX stuff goes here
@@ -334,7 +334,7 @@ elsa_interrupt(int intno, void *dev_id, struct pt_regs *regs)
         writereg(cs->hw.elsa.ale, cs->hw.elsa.hscx, HSCX_MASK, 0xFF);
         writereg(cs->hw.elsa.ale, cs->hw.elsa.hscx, HSCX_MASK + 0x40, 0xFF);
         writereg(cs->hw.elsa.ale, cs->hw.elsa.isac, ISAC_MASK, 0xFF);
-        if (cs->hw.elsa.status & ELSA_TIMER_AKTIV) {
+        if (cs->hw.elsa.status & ELIRQF_TIMER_AKTIV) {
                 if (!TimerRun(cs)) {
                         /* Timer Restart */
                         byteout(cs->hw.elsa.timer, 0);
@@ -685,7 +685,7 @@ Elsa_card_msg(struct IsdnCardState *cs, int mt, void *arg)
                                 spin_lock_irqsave(&cs->lock, flags);
                                 cs->hw.elsa.counter = 0;
                                 cs->hw.elsa.ctrl_reg |= ELSA_ENA_TIMER_INT;
-                                cs->hw.elsa.status |= ELSA_TIMER_AKTIV;
+                                cs->hw.elsa.status |= ELIRQF_TIMER_AKTIV;
                                 byteout(cs->hw.elsa.ctrl, cs->hw.elsa.ctrl_reg);
                                 byteout(cs->hw.elsa.timer, 0);
                                 spin_unlock_irqrestore(&cs->lock, flags);
@@ -693,7 +693,7 @@ Elsa_card_msg(struct IsdnCardState *cs, int mt, void *arg)
                                 spin_lock_irqsave(&cs->lock, flags);
                                 cs->hw.elsa.ctrl_reg &= ~ELSA_ENA_TIMER_INT;
                                 byteout(cs->hw.elsa.ctrl, cs->hw.elsa.ctrl_reg);
-                                cs->hw.elsa.status &= ~ELSA_TIMER_AKTIV;
+                                cs->hw.elsa.status &= ~ELIRQF_TIMER_AKTIV;
                                 spin_unlock_irqrestore(&cs->lock, flags);
                                 printk(KERN_INFO "Elsa: %d timer tics in 110 msek\n",
                                        cs->hw.elsa.counter);
@@ -1012,7 +1012,7 @@ setup_elsa(struct IsdnCard *card)
                 cs->hw.elsa.timer = 0;
                 cs->hw.elsa.trig = 0;
                 cs->hw.elsa.ctrl = 0;
-                cs->irq_flags |= SA_SHIRQ;
+                cs->irq_flags |= IRQF_SHARED;
                 printk(KERN_INFO
                        "Elsa: %s defined at %#lx IRQ %d\n",
                        Elsa_Types[cs->subtyp],
@@ -1061,7 +1061,7 @@ setup_elsa(struct IsdnCard *card)
                 test_and_set_bit(HW_IPAC, &cs->HW_Flags);
                 cs->hw.elsa.timer = 0;
                 cs->hw.elsa.trig  = 0;
-                cs->irq_flags |= SA_SHIRQ;
+                cs->irq_flags |= IRQF_SHARED;
                 printk(KERN_INFO
                        "Elsa: %s defined at %#lx/0x%x IRQ %d\n",
                        Elsa_Types[cs->subtyp],
diff --git a/drivers/isdn/hisax/enternow_pci.c b/drivers/isdn/hisax/enternow_pci.c
index 5f4876184691..8fcbe2e7d765 100644
--- a/drivers/isdn/hisax/enternow_pci.c
+++ b/drivers/isdn/hisax/enternow_pci.c
@@ -405,7 +405,7 @@ setup_enternow_pci(struct IsdnCard *card)
         cs->BC_Send_Data = &netjet_fill_dma;
         cs->cardmsg = &enpci_card_msg;
         cs->irq_func = &enpci_interrupt;
-        cs->irq_flags |= SA_SHIRQ;
+        cs->irq_flags |= IRQF_SHARED;
 
         return (1);
 }
diff --git a/drivers/isdn/hisax/gazel.c b/drivers/isdn/hisax/gazel.c
index 82a1d2e86cee..3e7d92303582 100644
--- a/drivers/isdn/hisax/gazel.c
+++ b/drivers/isdn/hisax/gazel.c
@@ -592,7 +592,7 @@ setup_gazelpci(struct IsdnCardState *cs)
         cs->hw.gazel.hscxfifo[0] = cs->hw.gazel.hscx[0];
         cs->hw.gazel.hscxfifo[1] = cs->hw.gazel.hscx[1];
         cs->irq = pci_irq;
-        cs->irq_flags |= SA_SHIRQ;
+        cs->irq_flags |= IRQF_SHARED;
 
         switch (seekcard) {
                 case PCI_DEVICE_ID_PLX_R685:
diff --git a/drivers/isdn/hisax/hfc4s8s_l1.c b/drivers/isdn/hisax/hfc4s8s_l1.c
index 913fd27a1f55..0f967b3df79d 100644
--- a/drivers/isdn/hisax/hfc4s8s_l1.c
+++ b/drivers/isdn/hisax/hfc4s8s_l1.c
@@ -1552,7 +1552,7 @@ setup_instance(hfc4s8s_hw * hw)
         INIT_WORK(&hw->tqueue, (void *) (void *) hfc4s8s_bh, hw);
 
         if (request_irq
-            (hw->irq, hfc4s8s_interrupt, SA_SHIRQ, hw->card_name, hw)) {
+            (hw->irq, hfc4s8s_interrupt, IRQF_SHARED, hw->card_name, hw)) {
                 printk(KERN_INFO
                        "HFC-4S/8S: unable to alloc irq %d, card ignored\n",
                        hw->irq);
diff --git a/drivers/isdn/hisax/hfc_pci.c b/drivers/isdn/hisax/hfc_pci.c
index fa9615747e26..7241e73879ba 100644
--- a/drivers/isdn/hisax/hfc_pci.c
+++ b/drivers/isdn/hisax/hfc_pci.c
@@ -1732,7 +1732,7 @@ setup_hfcpci(struct IsdnCard *card)
                 cs->BC_Read_Reg = NULL;
                 cs->BC_Write_Reg = NULL;
                 cs->irq_func = &hfcpci_interrupt;
-                cs->irq_flags |= SA_SHIRQ;
+                cs->irq_flags |= IRQF_SHARED;
                 cs->hw.hfcpci.timer.function = (void *) hfcpci_Timer;
                 cs->hw.hfcpci.timer.data = (long) cs;
                 init_timer(&cs->hw.hfcpci.timer);
diff --git a/drivers/isdn/hisax/hisax_fcpcipnp.c b/drivers/isdn/hisax/hisax_fcpcipnp.c
index dbcca287ee2c..1d7cf3bd6aa3 100644
--- a/drivers/isdn/hisax/hisax_fcpcipnp.c
+++ b/drivers/isdn/hisax/hisax_fcpcipnp.c
@@ -725,11 +725,11 @@ static int __devinit fcpcipnp_setup(struct fritz_adapter *adapter)
 
         switch (adapter->type) {
         case AVM_FRITZ_PCIV2:
-                retval = request_irq(adapter->irq, fcpci2_irq, SA_SHIRQ, 
+                retval = request_irq(adapter->irq, fcpci2_irq, IRQF_SHARED,
                                      "fcpcipnp", adapter);
                 break;
         case AVM_FRITZ_PCI:
-                retval = request_irq(adapter->irq, fcpci_irq, SA_SHIRQ,
+                retval = request_irq(adapter->irq, fcpci_irq, IRQF_SHARED,
                                      "fcpcipnp", adapter);
                 break;
         case AVM_FRITZ_PNP:
diff --git a/drivers/isdn/hisax/niccy.c b/drivers/isdn/hisax/niccy.c
index 868762cf76c6..79a97b1c3812 100644
--- a/drivers/isdn/hisax/niccy.c
+++ b/drivers/isdn/hisax/niccy.c
@@ -336,7 +336,7 @@ setup_niccy(struct IsdnCard *card)
                         printk(KERN_WARNING "Niccy: No PCI card found\n");
                         return(0);
                 }
-                cs->irq_flags |= SA_SHIRQ;
+                cs->irq_flags |= IRQF_SHARED;
                 cs->hw.niccy.isac = pci_ioaddr + ISAC_PCI_DATA;
                 cs->hw.niccy.isac_ale = pci_ioaddr + ISAC_PCI_ADDR;
                 cs->hw.niccy.hscx = pci_ioaddr + HSCX_PCI_DATA;
diff --git a/drivers/isdn/hisax/nj_s.c b/drivers/isdn/hisax/nj_s.c
index 1b3ac46df52c..e5b900a6fa0b 100644
--- a/drivers/isdn/hisax/nj_s.c
+++ b/drivers/isdn/hisax/nj_s.c
@@ -271,7 +271,7 @@ setup_netjet_s(struct IsdnCard *card)
         setup_isac(cs);
         cs->cardmsg = &NETjet_S_card_msg;
         cs->irq_func = &netjet_s_interrupt;
-        cs->irq_flags |= SA_SHIRQ;
+        cs->irq_flags |= IRQF_SHARED;
         ISACVersion(cs, "NETjet-S:");
         return (1);
 }
diff --git a/drivers/isdn/hisax/nj_u.c b/drivers/isdn/hisax/nj_u.c
index 7a6010eac60d..7002b09936d4 100644
--- a/drivers/isdn/hisax/nj_u.c
+++ b/drivers/isdn/hisax/nj_u.c
@@ -237,7 +237,7 @@ setup_netjet_u(struct IsdnCard *card)
         cs->BC_Send_Data = &netjet_fill_dma;
         cs->cardmsg = &NETjet_U_card_msg;
         cs->irq_func = &netjet_u_interrupt;
-        cs->irq_flags |= SA_SHIRQ;
+        cs->irq_flags |= IRQF_SHARED;
         ICCVersion(cs, "NETspider-U:");
         return (1);
 }
diff --git a/drivers/isdn/hisax/sedlbauer.c b/drivers/isdn/hisax/sedlbauer.c
index 11ea456626b6..8d8e8a299892 100644
--- a/drivers/isdn/hisax/sedlbauer.c
+++ b/drivers/isdn/hisax/sedlbauer.c
@@ -632,7 +632,7 @@ setup_sedlbauer(struct IsdnCard *card)
                         printk(KERN_WARNING "Sedlbauer: No PCI card found\n");
                         return(0);
                 }
-                cs->irq_flags |= SA_SHIRQ;
+                cs->irq_flags |= IRQF_SHARED;
                 cs->hw.sedl.bus = SEDL_BUS_PCI;
                 sub_vendor_id = dev_sedl->subsystem_vendor;
                 sub_id = dev_sedl->subsystem_device;
@@ -809,7 +809,7 @@ ready:
                                 cs->hw.sedl.hscx = cs->hw.sedl.cfg_reg + SEDL_HSCX_PCMCIA_HSCX;
                                 cs->hw.sedl.reset_on = cs->hw.sedl.cfg_reg + SEDL_HSCX_PCMCIA_RESET;
                                 cs->hw.sedl.reset_off = cs->hw.sedl.cfg_reg + SEDL_HSCX_PCMCIA_RESET;
-                                cs->irq_flags |= SA_SHIRQ;
+                                cs->irq_flags |= IRQF_SHARED;
                         } else {
                                 cs->hw.sedl.adr = cs->hw.sedl.cfg_reg + SEDL_HSCX_ISA_ADR;
                                 cs->hw.sedl.isac = cs->hw.sedl.cfg_reg + SEDL_HSCX_ISA_ISAC;
diff --git a/drivers/isdn/hisax/teles3.c b/drivers/isdn/hisax/teles3.c
index 090abd16b4bc..5cb712437da4 100644
--- a/drivers/isdn/hisax/teles3.c
+++ b/drivers/isdn/hisax/teles3.c
@@ -369,7 +369,7 @@ setup_teles3(struct IsdnCard *card)
                                cs->hw.teles3.hscx[1] + 96);
                         return (0);
                 }
-                cs->irq_flags |= SA_SHIRQ; /* cardbus can share */
+                cs->irq_flags |= IRQF_SHARED; /* cardbus can share */
         } else {
                 if (cs->hw.teles3.cfg_reg) {
                         if (cs->typ == ISDN_CTYPE_COMPAQ_ISA) {
diff --git a/drivers/isdn/hisax/telespci.c b/drivers/isdn/hisax/telespci.c
index a1bb73e28841..9382cdf04d8d 100644
--- a/drivers/isdn/hisax/telespci.c
+++ b/drivers/isdn/hisax/telespci.c
@@ -347,7 +347,7 @@ setup_telespci(struct IsdnCard *card)
         cs->BC_Send_Data = &hscx_fill_fifo;
         cs->cardmsg = &TelesPCI_card_msg;
         cs->irq_func = &telespci_interrupt;
-        cs->irq_flags |= SA_SHIRQ;
+        cs->irq_flags |= IRQF_SHARED;
         ISACVersion(cs, "TelesPCI:");
         if (HscxVersion(cs, "TelesPCI:")) {
                 printk(KERN_WARNING
diff --git a/drivers/isdn/hisax/w6692.c b/drivers/isdn/hisax/w6692.c
index 00e4fa2aef51..6c68419c05ff 100644
--- a/drivers/isdn/hisax/w6692.c
+++ b/drivers/isdn/hisax/w6692.c
@@ -1080,7 +1080,7 @@ setup_w6692(struct IsdnCard *card)
         cs->BC_Send_Data = &W6692B_fill_fifo;
         cs->cardmsg = &w6692_card_msg;
         cs->irq_func = &W6692_interrupt;
-        cs->irq_flags |= SA_SHIRQ;
+        cs->irq_flags |= IRQF_SHARED;
         W6692Version(cs, "W6692:");
         printk(KERN_INFO "W6692 ISTA=0x%X\n", ReadW6692(cs, W_ISTA));
         printk(KERN_INFO "W6692 IMASK=0x%X\n", ReadW6692(cs, W_IMASK));