[PATCH] irq-flags: drivers/net: 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: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

8 files changed, 12 insertions, 12 deletions

diff --git a/drivers/net/tulip/de2104x.c b/drivers/net/tulip/de2104x.c
index 354294c6271e..d05c5aa254ee 100644
--- a/drivers/net/tulip/de2104x.c
+++ b/drivers/net/tulip/de2104x.c
@@ -1371,7 +1371,7 @@ static int de_open (struct net_device *dev)
 
         dw32(IntrMask, 0);
 
-        rc = request_irq(dev->irq, de_interrupt, SA_SHIRQ, dev->name, dev);
+        rc = request_irq(dev->irq, de_interrupt, IRQF_SHARED, dev->name, dev);
         if (rc) {
                 printk(KERN_ERR "%s: IRQ %d request failure, err=%d\n",
                        dev->name, dev->irq, rc);
diff --git a/drivers/net/tulip/de4x5.c b/drivers/net/tulip/de4x5.c
index 2647a5bc5211..75ff14a55239 100644
--- a/drivers/net/tulip/de4x5.c
+++ b/drivers/net/tulip/de4x5.c
@@ -292,7 +292,7 @@
       0.41    21-Mar-96   Don't check for get_hw_addr checksum unless DEC card
                           only <niles@axp745gsfc.nasa.gov>
                           Fix for multiple PCI cards reported by <jos@xos.nl>
-                          Duh, put the SA_SHIRQ flag into request_interrupt().
+                          Duh, put the IRQF_SHARED flag into request_interrupt().
                           Fix SMC ethernet address in enet_det[].
                           Print chip name instead of "UNKNOWN" during boot.
       0.42    26-Apr-96   Fix MII write TA bit error.
@@ -353,7 +353,7 @@
                            infoblocks.
                           Added DC21142 and DC21143 functions.
                           Added byte counters from <phil@tazenda.demon.co.uk>
-                          Added SA_INTERRUPT temporary fix from
+                          Added IRQF_DISABLED temporary fix from
                            <mjacob@feral.com>.
       0.53   12-Nov-97    Fix the *_probe() to include 'eth??' name during
                            module load: bug reported by
@@ -1319,10 +1319,10 @@ de4x5_open(struct net_device *dev)
     lp->state = OPEN;
     de4x5_dbg_open(dev);
 
-    if (request_irq(dev->irq, (void *)de4x5_interrupt, SA_SHIRQ,
+    if (request_irq(dev->irq, (void *)de4x5_interrupt, IRQF_SHARED,
                                                      lp->adapter_name, dev)) {
         printk("de4x5_open(): Requested IRQ%d is busy - attemping FAST/SHARE...", dev->irq);
-        if (request_irq(dev->irq, de4x5_interrupt, SA_INTERRUPT | SA_SHIRQ,
+        if (request_irq(dev->irq, de4x5_interrupt, IRQF_DISABLED | IRQF_SHARED,
                                                      lp->adapter_name, dev)) {
             printk("\n              Cannot get IRQ- reconfigure your hardware.\n");
             disable_ast(dev);
diff --git a/drivers/net/tulip/dmfe.c b/drivers/net/tulip/dmfe.c
index ba5b112093f4..4e5b0f2acc39 100644
--- a/drivers/net/tulip/dmfe.c
+++ b/drivers/net/tulip/dmfe.c
@@ -506,7 +506,7 @@ static int dmfe_open(struct DEVICE *dev)
 
         DMFE_DBUG(0, "dmfe_open", 0);
 
-        ret = request_irq(dev->irq, &dmfe_interrupt, SA_SHIRQ, dev->name, dev);
+        ret = request_irq(dev->irq, &dmfe_interrupt, IRQF_SHARED, dev->name, dev);
         if (ret)
                 return ret;
 
diff --git a/drivers/net/tulip/tulip_core.c b/drivers/net/tulip/tulip_core.c
index 8f4f4840fc12..7351831f57ce 100644
--- a/drivers/net/tulip/tulip_core.c
+++ b/drivers/net/tulip/tulip_core.c
@@ -489,7 +489,7 @@ tulip_open(struct net_device *dev)
 {
         int retval;
 
-        if ((retval = request_irq(dev->irq, &tulip_interrupt, SA_SHIRQ, dev->name, dev)))
+        if ((retval = request_irq(dev->irq, &tulip_interrupt, IRQF_SHARED, dev->name, dev)))
                 return retval;
 
         tulip_init_ring (dev);
@@ -1770,7 +1770,7 @@ static int tulip_resume(struct pci_dev *pdev)
 
         pci_enable_device(pdev);
 
-        if ((retval = request_irq(dev->irq, &tulip_interrupt, SA_SHIRQ, dev->name, dev))) {
+        if ((retval = request_irq(dev->irq, &tulip_interrupt, IRQF_SHARED, dev->name, dev))) {
                 printk (KERN_ERR "tulip: request_irq failed in resume\n");
                 return retval;
         }
diff --git a/drivers/net/tulip/uli526x.c b/drivers/net/tulip/uli526x.c
index 8b3a28f53c3d..fd64b2b3e99c 100644
--- a/drivers/net/tulip/uli526x.c
+++ b/drivers/net/tulip/uli526x.c
@@ -436,7 +436,7 @@ static int uli526x_open(struct net_device *dev)
 
         ULI526X_DBUG(0, "uli526x_open", 0);
 
-        ret = request_irq(dev->irq, &uli526x_interrupt, SA_SHIRQ, dev->name, dev);
+        ret = request_irq(dev->irq, &uli526x_interrupt, IRQF_SHARED, dev->name, dev);
         if (ret)
                 return ret;
 
diff --git a/drivers/net/tulip/winbond-840.c b/drivers/net/tulip/winbond-840.c
index 602a6e5002a0..b4c0d101a7d7 100644
--- a/drivers/net/tulip/winbond-840.c
+++ b/drivers/net/tulip/winbond-840.c
@@ -658,7 +658,7 @@ static int netdev_open(struct net_device *dev)
         iowrite32(0x00000001, ioaddr + PCIBusCfg);              /* Reset */
 
         netif_device_detach(dev);
-        i = request_irq(dev->irq, &intr_handler, SA_SHIRQ, dev->name, dev);
+        i = request_irq(dev->irq, &intr_handler, IRQF_SHARED, dev->name, dev);
         if (i)
                 goto out_err;
 
diff --git a/drivers/net/tulip/xircom_cb.c b/drivers/net/tulip/xircom_cb.c
index 63c2175ed138..f874e4f6ccf6 100644
--- a/drivers/net/tulip/xircom_cb.c
+++ b/drivers/net/tulip/xircom_cb.c
@@ -457,7 +457,7 @@ static int xircom_open(struct net_device *dev)
         int retval;
         enter("xircom_open");
         printk(KERN_INFO "xircom cardbus adaptor found, registering as %s, using irq %i \n",dev->name,dev->irq);
-        retval = request_irq(dev->irq, &xircom_interrupt, SA_SHIRQ, dev->name, dev);
+        retval = request_irq(dev->irq, &xircom_interrupt, IRQF_SHARED, dev->name, dev);
         if (retval) {
                 leave("xircom_open - No IRQ");
                 return retval;
diff --git a/drivers/net/tulip/xircom_tulip_cb.c b/drivers/net/tulip/xircom_tulip_cb.c
index aecafdabbc91..091ebb7a62f6 100644
--- a/drivers/net/tulip/xircom_tulip_cb.c
+++ b/drivers/net/tulip/xircom_tulip_cb.c
@@ -807,7 +807,7 @@ xircom_open(struct net_device *dev)
 {
         struct xircom_private *tp = netdev_priv(dev);
 
-        if (request_irq(dev->irq, &xircom_interrupt, SA_SHIRQ, dev->name, dev))
+        if (request_irq(dev->irq, &xircom_interrupt, IRQF_SHARED, dev->name, dev))
                 return -EAGAIN;
 
         xircom_up(dev);