projects
/
GitHub
/
LineageOS
/
android_kernel_motorola_exynos9610.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
dace145
)
[PATCH] irq-flags: drivers/net: Use the new IRQF_ constants
author
Thomas Gleixner
<tglx@linutronix.de>
Sun, 2 Jul 2006 02:29:39 +0000
(19:29 -0700)
committer
Linus Torvalds
<torvalds@g5.osdl.org>
Sun, 2 Jul 2006 20:58:51 +0000
(13:58 -0700)
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>
128 files changed:
drivers/net/3c515.c
patch
|
blob
|
blame
|
history
drivers/net/3c523.c
patch
|
blob
|
blame
|
history
drivers/net/3c527.c
patch
|
blob
|
blame
|
history
drivers/net/3c59x.c
patch
|
blob
|
blame
|
history
drivers/net/8139cp.c
patch
|
blob
|
blame
|
history
drivers/net/8139too.c
patch
|
blob
|
blame
|
history
drivers/net/a2065.c
patch
|
blob
|
blame
|
history
drivers/net/acenic.c
patch
|
blob
|
blame
|
history
drivers/net/amd8111e.c
patch
|
blob
|
blame
|
history
drivers/net/apne.c
patch
|
blob
|
blame
|
history
drivers/net/arcnet/com20020-pci.c
patch
|
blob
|
blame
|
history
drivers/net/ariadne.c
patch
|
blob
|
blame
|
history
drivers/net/b44.c
patch
|
blob
|
blame
|
history
drivers/net/bnx2.c
patch
|
blob
|
blame
|
history
drivers/net/cassini.c
patch
|
blob
|
blame
|
history
drivers/net/chelsio/cxgb2.c
patch
|
blob
|
blame
|
history
drivers/net/cris/eth_v10.c
patch
|
blob
|
blame
|
history
drivers/net/defxx.c
patch
|
blob
|
blame
|
history
drivers/net/dgrs.c
patch
|
blob
|
blame
|
history
drivers/net/dl2k.c
patch
|
blob
|
blame
|
history
drivers/net/dm9000.c
patch
|
blob
|
blame
|
history
drivers/net/e100.c
patch
|
blob
|
blame
|
history
drivers/net/e1000/e1000_ethtool.c
patch
|
blob
|
blame
|
history
drivers/net/e1000/e1000_main.c
patch
|
blob
|
blame
|
history
drivers/net/eepro.c
patch
|
blob
|
blame
|
history
drivers/net/eepro100.c
patch
|
blob
|
blame
|
history
drivers/net/epic100.c
patch
|
blob
|
blame
|
history
drivers/net/fealnx.c
patch
|
blob
|
blame
|
history
drivers/net/forcedeth.c
patch
|
blob
|
blame
|
history
drivers/net/fs_enet/fs_enet-main.c
patch
|
blob
|
blame
|
history
drivers/net/gt96100eth.c
patch
|
blob
|
blame
|
history
drivers/net/hamachi.c
patch
|
blob
|
blame
|
history
drivers/net/hamradio/baycom_ser_fdx.c
patch
|
blob
|
blame
|
history
drivers/net/hamradio/baycom_ser_hdx.c
patch
|
blob
|
blame
|
history
drivers/net/hamradio/scc.c
patch
|
blob
|
blame
|
history
drivers/net/hamradio/yam.c
patch
|
blob
|
blame
|
history
drivers/net/hp100.c
patch
|
blob
|
blame
|
history
drivers/net/hydra.c
patch
|
blob
|
blame
|
history
drivers/net/ibmlana.c
patch
|
blob
|
blame
|
history
drivers/net/ioc3-eth.c
patch
|
blob
|
blame
|
history
drivers/net/irda/donauboe.c
patch
|
blob
|
blame
|
history
drivers/net/irda/vlsi_ir.c
patch
|
blob
|
blame
|
history
drivers/net/ixgb/ixgb_main.c
patch
|
blob
|
blame
|
history
drivers/net/ixp2000/ixpdev.c
patch
|
blob
|
blame
|
history
drivers/net/jazzsonic.c
patch
|
blob
|
blame
|
history
drivers/net/lp486e.c
patch
|
blob
|
blame
|
history
drivers/net/mipsnet.c
patch
|
blob
|
blame
|
history
drivers/net/mv643xx_eth.c
patch
|
blob
|
blame
|
history
drivers/net/myri10ge/myri10ge.c
patch
|
blob
|
blame
|
history
drivers/net/myri_sbus.c
patch
|
blob
|
blame
|
history
drivers/net/natsemi.c
patch
|
blob
|
blame
|
history
drivers/net/ne2k-pci.c
patch
|
blob
|
blame
|
history
drivers/net/netx-eth.c
patch
|
blob
|
blame
|
history
drivers/net/ns83820.c
patch
|
blob
|
blame
|
history
drivers/net/pci-skeleton.c
patch
|
blob
|
blame
|
history
drivers/net/pcmcia/axnet_cs.c
patch
|
blob
|
blame
|
history
drivers/net/pcmcia/pcnet_cs.c
patch
|
blob
|
blame
|
history
drivers/net/pcnet32.c
patch
|
blob
|
blame
|
history
drivers/net/phy/phy.c
patch
|
blob
|
blame
|
history
drivers/net/r8169.c
patch
|
blob
|
blame
|
history
drivers/net/rrunner.c
patch
|
blob
|
blame
|
history
drivers/net/s2io.c
patch
|
blob
|
blame
|
history
drivers/net/sb1250-mac.c
patch
|
blob
|
blame
|
history
drivers/net/sis190.c
patch
|
blob
|
blame
|
history
drivers/net/sis900.c
patch
|
blob
|
blame
|
history
drivers/net/sk98lin/skge.c
patch
|
blob
|
blame
|
history
drivers/net/sk_mca.c
patch
|
blob
|
blame
|
history
drivers/net/skfp/skfddi.c
patch
|
blob
|
blame
|
history
drivers/net/skge.c
patch
|
blob
|
blame
|
history
drivers/net/sky2.c
patch
|
blob
|
blame
|
history
drivers/net/smc-ultra32.c
patch
|
blob
|
blame
|
history
drivers/net/smc911x.c
patch
|
blob
|
blame
|
history
drivers/net/smc91x.h
patch
|
blob
|
blame
|
history
drivers/net/spider_net.c
patch
|
blob
|
blame
|
history
drivers/net/starfire.c
patch
|
blob
|
blame
|
history
drivers/net/sun3lance.c
patch
|
blob
|
blame
|
history
drivers/net/sunbmac.c
patch
|
blob
|
blame
|
history
drivers/net/sundance.c
patch
|
blob
|
blame
|
history
drivers/net/sungem.c
patch
|
blob
|
blame
|
history
drivers/net/sunhme.c
patch
|
blob
|
blame
|
history
drivers/net/sunlance.c
patch
|
blob
|
blame
|
history
drivers/net/sunqe.c
patch
|
blob
|
blame
|
history
drivers/net/tc35815.c
patch
|
blob
|
blame
|
history
drivers/net/tg3.c
patch
|
blob
|
blame
|
history
drivers/net/tlan.c
patch
|
blob
|
blame
|
history
drivers/net/tokenring/3c359.c
patch
|
blob
|
blame
|
history
drivers/net/tokenring/abyss.c
patch
|
blob
|
blame
|
history
drivers/net/tokenring/lanstreamer.c
patch
|
blob
|
blame
|
history
drivers/net/tokenring/madgemc.c
patch
|
blob
|
blame
|
history
drivers/net/tokenring/olympic.c
patch
|
blob
|
blame
|
history
drivers/net/tokenring/smctr.c
patch
|
blob
|
blame
|
history
drivers/net/tokenring/tmspci.c
patch
|
blob
|
blame
|
history
drivers/net/tulip/de2104x.c
patch
|
blob
|
blame
|
history
drivers/net/tulip/de4x5.c
patch
|
blob
|
blame
|
history
drivers/net/tulip/dmfe.c
patch
|
blob
|
blame
|
history
drivers/net/tulip/tulip_core.c
patch
|
blob
|
blame
|
history
drivers/net/tulip/uli526x.c
patch
|
blob
|
blame
|
history
drivers/net/tulip/winbond-840.c
patch
|
blob
|
blame
|
history
drivers/net/tulip/xircom_cb.c
patch
|
blob
|
blame
|
history
drivers/net/tulip/xircom_tulip_cb.c
patch
|
blob
|
blame
|
history
drivers/net/typhoon.c
patch
|
blob
|
blame
|
history
drivers/net/via-rhine.c
patch
|
blob
|
blame
|
history
drivers/net/via-velocity.c
patch
|
blob
|
blame
|
history
drivers/net/wan/dscc4.c
patch
|
blob
|
blame
|
history
drivers/net/wan/farsync.c
patch
|
blob
|
blame
|
history
drivers/net/wan/hostess_sv11.c
patch
|
blob
|
blame
|
history
drivers/net/wan/lmc/lmc_main.c
patch
|
blob
|
blame
|
history
drivers/net/wan/pc300_drv.c
patch
|
blob
|
blame
|
history
drivers/net/wan/pci200syn.c
patch
|
blob
|
blame
|
history
drivers/net/wan/sbni.c
patch
|
blob
|
blame
|
history
drivers/net/wan/sealevel.c
patch
|
blob
|
blame
|
history
drivers/net/wan/wanxl.c
patch
|
blob
|
blame
|
history
drivers/net/wireless/airo.c
patch
|
blob
|
blame
|
history
drivers/net/wireless/atmel.c
patch
|
blob
|
blame
|
history
drivers/net/wireless/bcm43xx/bcm43xx_main.c
patch
|
blob
|
blame
|
history
drivers/net/wireless/hostap/hostap_pci.c
patch
|
blob
|
blame
|
history
drivers/net/wireless/hostap/hostap_plx.c
patch
|
blob
|
blame
|
history
drivers/net/wireless/ipw2100.c
patch
|
blob
|
blame
|
history
drivers/net/wireless/ipw2200.c
patch
|
blob
|
blame
|
history
drivers/net/wireless/orinoco_nortel.c
patch
|
blob
|
blame
|
history
drivers/net/wireless/orinoco_pci.c
patch
|
blob
|
blame
|
history
drivers/net/wireless/orinoco_pci.h
patch
|
blob
|
blame
|
history
drivers/net/wireless/orinoco_plx.c
patch
|
blob
|
blame
|
history
drivers/net/wireless/orinoco_tmd.c
patch
|
blob
|
blame
|
history
drivers/net/wireless/prism54/islpci_hotplug.c
patch
|
blob
|
blame
|
history
drivers/net/yellowfin.c
patch
|
blob
|
blame
|
history
drivers/net/zorro8390.c
patch
|
blob
|
blame
|
history
include/net/irda/irda_device.h
patch
|
blob
|
blame
|
history
diff --git
a/drivers/net/3c515.c
b/drivers/net/3c515.c
index ac60f3f62db8edfb80ad399f7c920af1f8d88e20..4532b17e40ea04a9649baa2b197077a718dc8c04 100644
(file)
--- a/
drivers/net/3c515.c
+++ b/
drivers/net/3c515.c
@@
-760,7
+760,7
@@
static int corkscrew_open(struct net_device *dev)
vp->product_name, dev)) return -EAGAIN;
enable_dma(dev->dma);
set_dma_mode(dev->dma, DMA_MODE_CASCADE);
vp->product_name, dev)) return -EAGAIN;
enable_dma(dev->dma);
set_dma_mode(dev->dma, DMA_MODE_CASCADE);
- } else if (request_irq(dev->irq, &corkscrew_interrupt,
SA_SHIRQ
,
+ } else if (request_irq(dev->irq, &corkscrew_interrupt,
IRQF_SHARED
,
vp->product_name, dev)) {
return -EAGAIN;
}
vp->product_name, dev)) {
return -EAGAIN;
}
diff --git
a/drivers/net/3c523.c
b/drivers/net/3c523.c
index 4bf8510655c52574a543b34bd6204a40ea47f7f5..5dfd97f0ba9ea1b7efc15b856ddf7e0006021a0d 100644
(file)
--- a/
drivers/net/3c523.c
+++ b/
drivers/net/3c523.c
@@
-289,7
+289,7
@@
static int elmc_open(struct net_device *dev)
elmc_id_attn586(); /* disable interrupts */
elmc_id_attn586(); /* disable interrupts */
- ret = request_irq(dev->irq, &elmc_interrupt,
SA_SHIRQ | SA
_SAMPLE_RANDOM,
+ ret = request_irq(dev->irq, &elmc_interrupt,
IRQF_SHARED | IRQF
_SAMPLE_RANDOM,
dev->name, dev);
if (ret) {
printk(KERN_ERR "%s: couldn't get irq %d\n", dev->name, dev->irq);
dev->name, dev);
if (ret) {
printk(KERN_ERR "%s: couldn't get irq %d\n", dev->name, dev->irq);
diff --git
a/drivers/net/3c527.c
b/drivers/net/3c527.c
index 157eda57392536df2af842f1baf36c82bb0792e7..03c0f7176fc918a902537c524352e907c5ef0f6d 100644
(file)
--- a/
drivers/net/3c527.c
+++ b/
drivers/net/3c527.c
@@
-435,7
+435,7
@@
static int __init mc32_probe1(struct net_device *dev, int slot)
* Grab the IRQ
*/
* Grab the IRQ
*/
- err = request_irq(dev->irq, &mc32_interrupt,
SA_SHIRQ | SA
_SAMPLE_RANDOM, DRV_NAME, dev);
+ err = request_irq(dev->irq, &mc32_interrupt,
IRQF_SHARED | IRQF
_SAMPLE_RANDOM, DRV_NAME, dev);
if (err) {
release_region(dev->base_addr, MC32_IO_EXTENT);
printk(KERN_ERR "%s: unable to get IRQ %d.\n", DRV_NAME, dev->irq);
if (err) {
release_region(dev->base_addr, MC32_IO_EXTENT);
printk(KERN_ERR "%s: unable to get IRQ %d.\n", DRV_NAME, dev->irq);
diff --git
a/drivers/net/3c59x.c
b/drivers/net/3c59x.c
index 45125db44177810ff04f7ac255de0a29f3ed2d37..8ab03b4a885e5d0c4fa4b96832b3388f2d06a30b 100644
(file)
--- a/
drivers/net/3c59x.c
+++ b/
drivers/net/3c59x.c
@@
-996,7
+996,7
@@
static int vortex_resume(struct pci_dev *pdev)
pci_enable_device(pdev);
pci_set_master(pdev);
if (request_irq(dev->irq, vp->full_bus_master_rx ?
pci_enable_device(pdev);
pci_set_master(pdev);
if (request_irq(dev->irq, vp->full_bus_master_rx ?
- &boomerang_interrupt : &vortex_interrupt,
SA_SHIRQ
, dev->name, dev)) {
+ &boomerang_interrupt : &vortex_interrupt,
IRQF_SHARED
, dev->name, dev)) {
printk(KERN_WARNING "%s: Could not reserve IRQ %d\n", dev->name, dev->irq);
pci_disable_device(pdev);
return -EBUSY;
printk(KERN_WARNING "%s: Could not reserve IRQ %d\n", dev->name, dev->irq);
pci_disable_device(pdev);
return -EBUSY;
@@
-1833,7
+1833,7
@@
vortex_open(struct net_device *dev)
/* Use the now-standard shared IRQ implementation. */
if ((retval = request_irq(dev->irq, vp->full_bus_master_rx ?
/* Use the now-standard shared IRQ implementation. */
if ((retval = request_irq(dev->irq, vp->full_bus_master_rx ?
- &boomerang_interrupt : &vortex_interrupt,
SA_SHIRQ
, dev->name, dev))) {
+ &boomerang_interrupt : &vortex_interrupt,
IRQF_SHARED
, dev->name, dev))) {
printk(KERN_ERR "%s: Could not reserve IRQ %d\n", dev->name, dev->irq);
goto out;
}
printk(KERN_ERR "%s: Could not reserve IRQ %d\n", dev->name, dev->irq);
goto out;
}
diff --git
a/drivers/net/8139cp.c
b/drivers/net/8139cp.c
index 1d7af760c2b13b70ea57dacf9841f52d2d050eb5..1959654cbec8c06ee685f9a7b8fed7a3e61a2a59 100644
(file)
--- a/
drivers/net/8139cp.c
+++ b/
drivers/net/8139cp.c
@@
-1203,7
+1203,7
@@
static int cp_open (struct net_device *dev)
cp_init_hw(cp);
cp_init_hw(cp);
- rc = request_irq(dev->irq, cp_interrupt,
SA_SHIRQ
, dev->name, dev);
+ rc = request_irq(dev->irq, cp_interrupt,
IRQF_SHARED
, dev->name, dev);
if (rc)
goto err_out_hw;
if (rc)
goto err_out_hw;
diff --git
a/drivers/net/8139too.c
b/drivers/net/8139too.c
index d21e98f5adbc8039de6fcd2aef4e4a12e830f7c1..717506b2b13a5ab41b056ced8d277a8cbc532650 100644
(file)
--- a/
drivers/net/8139too.c
+++ b/
drivers/net/8139too.c
@@
-1310,7
+1310,7
@@
static int rtl8139_open (struct net_device *dev)
int retval;
void __iomem *ioaddr = tp->mmio_addr;
int retval;
void __iomem *ioaddr = tp->mmio_addr;
- retval = request_irq (dev->irq, rtl8139_interrupt,
SA_SHIRQ
, dev->name, dev);
+ retval = request_irq (dev->irq, rtl8139_interrupt,
IRQF_SHARED
, dev->name, dev);
if (retval)
return retval;
if (retval)
return retval;
diff --git
a/drivers/net/a2065.c
b/drivers/net/a2065.c
index 519390c033c3728ac6070ab543a1fec0d29e2086..f4ea62641acd59c41958bc96721051045f171bd3 100644
(file)
--- a/
drivers/net/a2065.c
+++ b/
drivers/net/a2065.c
@@
-495,7
+495,7
@@
static int lance_open (struct net_device *dev)
ll->rdp = LE_C0_STOP;
/* Install the Interrupt handler */
ll->rdp = LE_C0_STOP;
/* Install the Interrupt handler */
- ret = request_irq(IRQ_AMIGA_PORTS, lance_interrupt,
SA_SHIRQ
,
+ ret = request_irq(IRQ_AMIGA_PORTS, lance_interrupt,
IRQF_SHARED
,
dev->name, dev);
if (ret) return ret;
dev->name, dev);
if (ret) return ret;
diff --git
a/drivers/net/acenic.c
b/drivers/net/acenic.c
index c290b5ae63b2093ea2a453f2e31b9bc5dc0de619..1c01e9b3d07c88cd2856232d268736ac77d87adc 100644
(file)
--- a/
drivers/net/acenic.c
+++ b/
drivers/net/acenic.c
@@
-1194,7
+1194,7
@@
static int __devinit ace_init(struct net_device *dev)
goto init_error;
}
goto init_error;
}
- ecode = request_irq(pdev->irq, ace_interrupt,
SA_SHIRQ
,
+ ecode = request_irq(pdev->irq, ace_interrupt,
IRQF_SHARED
,
DRV_NAME, dev);
if (ecode) {
printk(KERN_WARNING "%s: Requested IRQ %d is busy\n",
DRV_NAME, dev);
if (ecode) {
printk(KERN_WARNING "%s: Requested IRQ %d is busy\n",
diff --git
a/drivers/net/amd8111e.c
b/drivers/net/amd8111e.c
index c017c4f6b3b5a4c4b38445a7de1e204c93d2fdca..ed322a76980d760bd045630f0abdf2842d674a5b 100644
(file)
--- a/
drivers/net/amd8111e.c
+++ b/
drivers/net/amd8111e.c
@@
-1376,7
+1376,7
@@
static int amd8111e_open(struct net_device * dev )
{
struct amd8111e_priv *lp = netdev_priv(dev);
{
struct amd8111e_priv *lp = netdev_priv(dev);
- if(dev->irq ==0 || request_irq(dev->irq, amd8111e_interrupt,
SA_SHIRQ
,
+ if(dev->irq ==0 || request_irq(dev->irq, amd8111e_interrupt,
IRQF_SHARED
,
dev->name, dev))
return -EAGAIN;
dev->name, dev))
return -EAGAIN;
diff --git
a/drivers/net/apne.c
b/drivers/net/apne.c
index b9820b86cdcc28f8d93031b9cccbe28d8544e44b..9cc13a0250d6f4af6689e07e72c3f602f1a63cfe 100644
(file)
--- a/
drivers/net/apne.c
+++ b/
drivers/net/apne.c
@@
-313,7
+313,7
@@
static int __init apne_probe1(struct net_device *dev, int ioaddr)
dev->base_addr = ioaddr;
/* Install the Interrupt handler */
dev->base_addr = ioaddr;
/* Install the Interrupt handler */
- i = request_irq(IRQ_AMIGA_PORTS, apne_interrupt,
SA_SHIRQ
, DRV_NAME, dev);
+ i = request_irq(IRQ_AMIGA_PORTS, apne_interrupt,
IRQF_SHARED
, DRV_NAME, dev);
if (i) return i;
for(i = 0; i < ETHER_ADDR_LEN; i++) {
if (i) return i;
for(i = 0; i < ETHER_ADDR_LEN; i++) {
diff --git
a/drivers/net/arcnet/com20020-pci.c
b/drivers/net/arcnet/com20020-pci.c
index 96636ca8754e896b85a7d47d90aa4caba371b4b8..979a33df0a8c3d84dc4871188c465871b822b50f 100644
(file)
--- a/
drivers/net/arcnet/com20020-pci.c
+++ b/
drivers/net/arcnet/com20020-pci.c
@@
-120,7
+120,7
@@
static int __devinit com20020pci_probe(struct pci_dev *pdev, const struct pci_de
goto out_port;
}
goto out_port;
}
- if ((err = com20020_found(dev,
SA_SHIRQ
)) != 0)
+ if ((err = com20020_found(dev,
IRQF_SHARED
)) != 0)
goto out_port;
return 0;
goto out_port;
return 0;
diff --git
a/drivers/net/ariadne.c
b/drivers/net/ariadne.c
index a9bb7a4aff9842dcd1413940882ec2e551085436..cc721addd576e8a7613c103854503ba2a9b53d07 100644
(file)
--- a/
drivers/net/ariadne.c
+++ b/
drivers/net/ariadne.c
@@
-320,7
+320,7
@@
static int ariadne_open(struct net_device *dev)
netif_start_queue(dev);
netif_start_queue(dev);
- i = request_irq(IRQ_AMIGA_PORTS, ariadne_interrupt,
SA_SHIRQ
,
+ i = request_irq(IRQ_AMIGA_PORTS, ariadne_interrupt,
IRQF_SHARED
,
dev->name, dev);
if (i) return i;
dev->name, dev);
if (i) return i;
diff --git
a/drivers/net/b44.c
b/drivers/net/b44.c
index a7e4ba5a580f6ff67d8794541b1ec20279ab1eef..cd98d31dee8c319ad9ad487d7ecce0e3767ddb73 100644
(file)
--- a/
drivers/net/b44.c
+++ b/
drivers/net/b44.c
@@
-1421,7
+1421,7
@@
static int b44_open(struct net_device *dev)
b44_check_phy(bp);
b44_check_phy(bp);
- err = request_irq(dev->irq, b44_interrupt,
SA_SHIRQ
, dev->name, dev);
+ err = request_irq(dev->irq, b44_interrupt,
IRQF_SHARED
, dev->name, dev);
if (unlikely(err < 0)) {
b44_chip_reset(bp);
b44_free_rings(bp);
if (unlikely(err < 0)) {
b44_chip_reset(bp);
b44_free_rings(bp);
@@
-2322,7
+2322,7
@@
static int b44_resume(struct pci_dev *pdev)
if (!netif_running(dev))
return 0;
if (!netif_running(dev))
return 0;
- if (request_irq(dev->irq, b44_interrupt,
SA_SHIRQ
, dev->name, dev))
+ if (request_irq(dev->irq, b44_interrupt,
IRQF_SHARED
, dev->name, dev))
printk(KERN_ERR PFX "%s: request_irq failed\n", dev->name);
spin_lock_irq(&bp->lock);
printk(KERN_ERR PFX "%s: request_irq failed\n", dev->name);
spin_lock_irq(&bp->lock);
diff --git
a/drivers/net/bnx2.c
b/drivers/net/bnx2.c
index 7e32d4ea71e22ff27473091079c9472fd0335f92..4f4db5ae503b35a27fac24c4a5da51e4b966bc4e 100644
(file)
--- a/
drivers/net/bnx2.c
+++ b/
drivers/net/bnx2.c
@@
-4260,11
+4260,11
@@
bnx2_open(struct net_device *dev)
}
else {
rc = request_irq(bp->pdev->irq, bnx2_interrupt,
}
else {
rc = request_irq(bp->pdev->irq, bnx2_interrupt,
-
SA_SHIRQ
, dev->name, dev);
+
IRQF_SHARED
, dev->name, dev);
}
}
else {
}
}
else {
- rc = request_irq(bp->pdev->irq, bnx2_interrupt,
SA_SHIRQ
,
+ rc = request_irq(bp->pdev->irq, bnx2_interrupt,
IRQF_SHARED
,
dev->name, dev);
}
if (rc) {
dev->name, dev);
}
if (rc) {
@@
-4311,7
+4311,7
@@
bnx2_open(struct net_device *dev)
if (!rc) {
rc = request_irq(bp->pdev->irq, bnx2_interrupt,
if (!rc) {
rc = request_irq(bp->pdev->irq, bnx2_interrupt,
-
SA_SHIRQ
, dev->name, dev);
+
IRQF_SHARED
, dev->name, dev);
}
if (rc) {
bnx2_free_skbs(bp);
}
if (rc) {
bnx2_free_skbs(bp);
diff --git
a/drivers/net/cassini.c
b/drivers/net/cassini.c
index b89c7bb2c591a74ca700460d938183022018dece..d33130f647000d7f50c030df89d875feb7ff35f8 100644
(file)
--- a/
drivers/net/cassini.c
+++ b/
drivers/net/cassini.c
@@
-4349,7
+4349,7
@@
static int cas_open(struct net_device *dev)
* mapping to expose them
*/
if (request_irq(cp->pdev->irq, cas_interrupt,
* mapping to expose them
*/
if (request_irq(cp->pdev->irq, cas_interrupt,
-
SA_SHIRQ
, dev->name, (void *) dev)) {
+
IRQF_SHARED
, dev->name, (void *) dev)) {
printk(KERN_ERR "%s: failed to request irq !\n",
cp->dev->name);
err = -EAGAIN;
printk(KERN_ERR "%s: failed to request irq !\n",
cp->dev->name);
err = -EAGAIN;
diff --git
a/drivers/net/chelsio/cxgb2.c
b/drivers/net/chelsio/cxgb2.c
index c490a862e79c029350dcfc765dfb89199ae8bca6..e67872433e9277bd1e778c3d1532710b53915015 100644
(file)
--- a/
drivers/net/chelsio/cxgb2.c
+++ b/
drivers/net/chelsio/cxgb2.c
@@
-218,7
+218,7
@@
static int cxgb_up(struct adapter *adapter)
t1_interrupts_clear(adapter);
if ((err = request_irq(adapter->pdev->irq,
t1_interrupts_clear(adapter);
if ((err = request_irq(adapter->pdev->irq,
- t1_select_intr_handler(adapter),
SA_SHIRQ
,
+ t1_select_intr_handler(adapter),
IRQF_SHARED
,
adapter->name, adapter))) {
goto out_err;
}
adapter->name, adapter))) {
goto out_err;
}
diff --git
a/drivers/net/cris/eth_v10.c
b/drivers/net/cris/eth_v10.c
index d3654fd71604408c3c4845ad515454cd8af94ef5..0eb1f8787ed740ddf72c9fc8e3f0c10e5f54e8c6 100644
(file)
--- a/
drivers/net/cris/eth_v10.c
+++ b/
drivers/net/cris/eth_v10.c
@@
-671,7
+671,7
@@
e100_open(struct net_device *dev)
/* allocate the irq corresponding to the receiving DMA */
if (request_irq(NETWORK_DMA_RX_IRQ_NBR, e100rxtx_interrupt,
/* allocate the irq corresponding to the receiving DMA */
if (request_irq(NETWORK_DMA_RX_IRQ_NBR, e100rxtx_interrupt,
-
SA
_SAMPLE_RANDOM, cardname, (void *)dev)) {
+
IRQF
_SAMPLE_RANDOM, cardname, (void *)dev)) {
goto grace_exit0;
}
goto grace_exit0;
}
diff --git
a/drivers/net/defxx.c
b/drivers/net/defxx.c
index 5acd35c312acb0734b91fc9a6983224a7f517e78..91cc8cbdd440dd8f2f7ce8da0c653e221f014e13 100644
(file)
--- a/
drivers/net/defxx.c
+++ b/
drivers/net/defxx.c
@@
-1228,7
+1228,7
@@
static int dfx_open(struct net_device *dev)
/* Register IRQ - support shared interrupts by passing device ptr */
/* Register IRQ - support shared interrupts by passing device ptr */
- ret = request_irq(dev->irq, dfx_interrupt,
SA_SHIRQ
, dev->name, dev);
+ ret = request_irq(dev->irq, dfx_interrupt,
IRQF_SHARED
, dev->name, dev);
if (ret) {
printk(KERN_ERR "%s: Requested IRQ %d is busy\n", dev->name, dev->irq);
return ret;
if (ret) {
printk(KERN_ERR "%s: Requested IRQ %d is busy\n", dev->name, dev->irq);
return ret;
diff --git
a/drivers/net/dgrs.c
b/drivers/net/dgrs.c
index e175d4876682d8705023ac84bd4c7d35afa7e129..fa4f09432975b5d17ee5797b419c6b43f3150567 100644
(file)
--- a/
drivers/net/dgrs.c
+++ b/
drivers/net/dgrs.c
@@
-1191,7
+1191,7
@@
dgrs_probe1(struct net_device *dev)
if (priv->plxreg)
OUTL(dev->base_addr + PLX_LCL2PCI_DOORBELL, 1);
if (priv->plxreg)
OUTL(dev->base_addr + PLX_LCL2PCI_DOORBELL, 1);
- rc = request_irq(dev->irq, &dgrs_intr,
SA_SHIRQ
, "RightSwitch", dev);
+ rc = request_irq(dev->irq, &dgrs_intr,
IRQF_SHARED
, "RightSwitch", dev);
if (rc)
goto err_out;
if (rc)
goto err_out;
diff --git
a/drivers/net/dl2k.c
b/drivers/net/dl2k.c
index 29778055223bf8e838c7fa9ece389d6db1a63731..4b6ddb70f921b9ab734ba63c9aa9aea1295ffd47 100644
(file)
--- a/
drivers/net/dl2k.c
+++ b/
drivers/net/dl2k.c
@@
-440,7
+440,7
@@
rio_open (struct net_device *dev)
int i;
u16 macctrl;
int i;
u16 macctrl;
- i = request_irq (dev->irq, &rio_interrupt,
SA_SHIRQ
, dev->name, dev);
+ i = request_irq (dev->irq, &rio_interrupt,
IRQF_SHARED
, dev->name, dev);
if (i)
return i;
if (i)
return i;
diff --git
a/drivers/net/dm9000.c
b/drivers/net/dm9000.c
index 7965a9b08e797fc3e0878422ebc989c4af28b728..1b758b70713486231d6f8593c559f0ced494801a 100644
(file)
--- a/
drivers/net/dm9000.c
+++ b/
drivers/net/dm9000.c
@@
-603,7
+603,7
@@
dm9000_open(struct net_device *dev)
PRINTK2("entering dm9000_open\n");
PRINTK2("entering dm9000_open\n");
- if (request_irq(dev->irq, &dm9000_interrupt,
SA_SHIRQ
, dev->name, dev))
+ if (request_irq(dev->irq, &dm9000_interrupt,
IRQF_SHARED
, dev->name, dev))
return -EAGAIN;
/* Initialize DM9000 board */
return -EAGAIN;
/* Initialize DM9000 board */
diff --git
a/drivers/net/e100.c
b/drivers/net/e100.c
index a1d676a0df7c62bfd71397ba10f50320317318dd..91ef5f2fd76883807eb23a5678fdff79014b6d50 100644
(file)
--- a/
drivers/net/e100.c
+++ b/
drivers/net/e100.c
@@
-2063,7
+2063,7
@@
static int e100_up(struct nic *nic)
e100_set_multicast_list(nic->netdev);
e100_start_receiver(nic, NULL);
mod_timer(&nic->watchdog, jiffies);
e100_set_multicast_list(nic->netdev);
e100_start_receiver(nic, NULL);
mod_timer(&nic->watchdog, jiffies);
- if((err = request_irq(nic->pdev->irq, e100_intr,
SA_SHIRQ
,
+ if((err = request_irq(nic->pdev->irq, e100_intr,
IRQF_SHARED
,
nic->netdev->name, nic->netdev)))
goto err_no_irq;
netif_wake_queue(nic->netdev);
nic->netdev->name, nic->netdev)))
goto err_no_irq;
netif_wake_queue(nic->netdev);
diff --git
a/drivers/net/e1000/e1000_ethtool.c
b/drivers/net/e1000/e1000_ethtool.c
index 6ed7f599eba3dd656ce3e3d1bb4776d21c4af93a..d19664891768799690fbbc624d9a589a3c26e707 100644
(file)
--- a/
drivers/net/e1000/e1000_ethtool.c
+++ b/
drivers/net/e1000/e1000_ethtool.c
@@
-871,10
+871,10
@@
e1000_intr_test(struct e1000_adapter *adapter, uint64_t *data)
*data = 0;
/* Hook up test interrupt handler just for this test */
*data = 0;
/* Hook up test interrupt handler just for this test */
- if (!request_irq(irq, &e1000_test_intr,
SA_PROBEIRQ, netdev->name
,
- netdev)) {
+ if (!request_irq(irq, &e1000_test_intr,
IRQF_PROBE_SHARED
,
+ netdev
->name, netdev
)) {
shared_int = FALSE;
shared_int = FALSE;
- } else if (request_irq(irq, &e1000_test_intr,
SA_SHIRQ
,
+ } else if (request_irq(irq, &e1000_test_intr,
IRQF_SHARED
,
netdev->name, netdev)){
*data = 1;
return -1;
netdev->name, netdev)){
*data = 1;
return -1;
diff --git
a/drivers/net/e1000/e1000_main.c
b/drivers/net/e1000/e1000_main.c
index 32b7d444b374073dca33b3333cdcccab1627cd0e..f77624f5f17bf33b0b23c3e2b6d31a25c795f0b2 100644
(file)
--- a/
drivers/net/e1000/e1000_main.c
+++ b/
drivers/net/e1000/e1000_main.c
@@
-426,7
+426,7
@@
e1000_up(struct e1000_adapter *adapter)
}
#endif
if ((err = request_irq(adapter->pdev->irq, &e1000_intr,
}
#endif
if ((err = request_irq(adapter->pdev->irq, &e1000_intr,
-
SA_SHIRQ | SA
_SAMPLE_RANDOM,
+
IRQF_SHARED | IRQF
_SAMPLE_RANDOM,
netdev->name, netdev))) {
DPRINTK(PROBE, ERR,
"Unable to allocate interrupt Error: %d\n", err);
netdev->name, netdev))) {
DPRINTK(PROBE, ERR,
"Unable to allocate interrupt Error: %d\n", err);
diff --git
a/drivers/net/eepro.c
b/drivers/net/eepro.c
index e70f172699dbfe4f0cb6196d187f9dbb840e02c7..20d31430c74f9869ee29491f77cb03478f867f35 100644
(file)
--- a/
drivers/net/eepro.c
+++ b/
drivers/net/eepro.c
@@
-920,7
+920,7
@@
static int eepro_grab_irq(struct net_device *dev)
eepro_sw2bank0(ioaddr); /* Switch back to Bank 0 */
eepro_sw2bank0(ioaddr); /* Switch back to Bank 0 */
- if (request_irq (*irqp, NULL,
SA_SHIRQ
, "bogus", dev) != EBUSY) {
+ if (request_irq (*irqp, NULL,
IRQF_SHARED
, "bogus", dev) != EBUSY) {
unsigned long irq_mask;
/* Twinkle the interrupt, and check if it's seen */
irq_mask = probe_irq_on();
unsigned long irq_mask;
/* Twinkle the interrupt, and check if it's seen */
irq_mask = probe_irq_on();
diff --git
a/drivers/net/eepro100.c
b/drivers/net/eepro100.c
index 1e2fbbbb966e3baa6956a17654d4d7962e5c0ecb..2ad327542927246ff70530be1653e6364e45089a 100644
(file)
--- a/
drivers/net/eepro100.c
+++ b/
drivers/net/eepro100.c
@@
-977,7
+977,7
@@
speedo_open(struct net_device *dev)
sp->in_interrupt = 0;
/* .. we can safely take handler calls during init. */
sp->in_interrupt = 0;
/* .. we can safely take handler calls during init. */
- retval = request_irq(dev->irq, &speedo_interrupt,
SA_SHIRQ
, dev->name, dev);
+ retval = request_irq(dev->irq, &speedo_interrupt,
IRQF_SHARED
, dev->name, dev);
if (retval) {
return retval;
}
if (retval) {
return retval;
}
diff --git
a/drivers/net/epic100.c
b/drivers/net/epic100.c
index b160abed8dd7ec1b14f014ddeea0c18dd998a6c8..9f3e09a3d88c8e5f9e50b5d95e4f692f4a9e6fc1 100644
(file)
--- a/
drivers/net/epic100.c
+++ b/
drivers/net/epic100.c
@@
-713,7
+713,7
@@
static int epic_open(struct net_device *dev)
/* Soft reset the chip. */
outl(0x4001, ioaddr + GENCTL);
/* Soft reset the chip. */
outl(0x4001, ioaddr + GENCTL);
- if ((retval = request_irq(dev->irq, &epic_interrupt,
SA_SHIRQ
, dev->name, dev)))
+ if ((retval = request_irq(dev->irq, &epic_interrupt,
IRQF_SHARED
, dev->name, dev)))
return retval;
epic_init_ring(dev);
return retval;
epic_init_ring(dev);
diff --git
a/drivers/net/fealnx.c
b/drivers/net/fealnx.c
index 13eca7ede2af8175d524b541fd74ec60900dd5cb..c701951dcd6f2ff7bbf02de85a071fafddf53c17 100644
(file)
--- a/
drivers/net/fealnx.c
+++ b/
drivers/net/fealnx.c
@@
-834,7
+834,7
@@
static int netdev_open(struct net_device *dev)
iowrite32(0x00000001, ioaddr + BCR); /* Reset */
iowrite32(0x00000001, ioaddr + BCR); /* Reset */
- if (request_irq(dev->irq, &intr_handler,
SA_SHIRQ
, dev->name, dev))
+ if (request_irq(dev->irq, &intr_handler,
IRQF_SHARED
, dev->name, dev))
return -EAGAIN;
for (i = 0; i < 3; i++)
return -EAGAIN;
for (i = 0; i < 3; i++)
diff --git
a/drivers/net/forcedeth.c
b/drivers/net/forcedeth.c
index 21be4fa071b52b47a8e20f547e484a937db78dc9..3c90003f4230f0e8b61b2718ee2b1736f0f00f1f 100644
(file)
--- a/
drivers/net/forcedeth.c
+++ b/
drivers/net/forcedeth.c
@@
-2622,21
+2622,21
@@
static int nv_request_irq(struct net_device *dev, int intr_test)
np->msi_flags |= NV_MSI_X_ENABLED;
if (optimization_mode == NV_OPTIMIZATION_MODE_THROUGHPUT && !intr_test) {
/* Request irq for rx handling */
np->msi_flags |= NV_MSI_X_ENABLED;
if (optimization_mode == NV_OPTIMIZATION_MODE_THROUGHPUT && !intr_test) {
/* Request irq for rx handling */
- if (request_irq(np->msi_x_entry[NV_MSI_X_VECTOR_RX].vector, &nv_nic_irq_rx,
SA_SHIRQ
, dev->name, dev) != 0) {
+ if (request_irq(np->msi_x_entry[NV_MSI_X_VECTOR_RX].vector, &nv_nic_irq_rx,
IRQF_SHARED
, dev->name, dev) != 0) {
printk(KERN_INFO "forcedeth: request_irq failed for rx %d\n", ret);
pci_disable_msix(np->pci_dev);
np->msi_flags &= ~NV_MSI_X_ENABLED;
goto out_err;
}
/* Request irq for tx handling */
printk(KERN_INFO "forcedeth: request_irq failed for rx %d\n", ret);
pci_disable_msix(np->pci_dev);
np->msi_flags &= ~NV_MSI_X_ENABLED;
goto out_err;
}
/* Request irq for tx handling */
- if (request_irq(np->msi_x_entry[NV_MSI_X_VECTOR_TX].vector, &nv_nic_irq_tx,
SA_SHIRQ
, dev->name, dev) != 0) {
+ if (request_irq(np->msi_x_entry[NV_MSI_X_VECTOR_TX].vector, &nv_nic_irq_tx,
IRQF_SHARED
, dev->name, dev) != 0) {
printk(KERN_INFO "forcedeth: request_irq failed for tx %d\n", ret);
pci_disable_msix(np->pci_dev);
np->msi_flags &= ~NV_MSI_X_ENABLED;
goto out_free_rx;
}
/* Request irq for link and timer handling */
printk(KERN_INFO "forcedeth: request_irq failed for tx %d\n", ret);
pci_disable_msix(np->pci_dev);
np->msi_flags &= ~NV_MSI_X_ENABLED;
goto out_free_rx;
}
/* Request irq for link and timer handling */
- if (request_irq(np->msi_x_entry[NV_MSI_X_VECTOR_OTHER].vector, &nv_nic_irq_other,
SA_SHIRQ
, dev->name, dev) != 0) {
+ if (request_irq(np->msi_x_entry[NV_MSI_X_VECTOR_OTHER].vector, &nv_nic_irq_other,
IRQF_SHARED
, dev->name, dev) != 0) {
printk(KERN_INFO "forcedeth: request_irq failed for link %d\n", ret);
pci_disable_msix(np->pci_dev);
np->msi_flags &= ~NV_MSI_X_ENABLED;
printk(KERN_INFO "forcedeth: request_irq failed for link %d\n", ret);
pci_disable_msix(np->pci_dev);
np->msi_flags &= ~NV_MSI_X_ENABLED;
@@
-2651,9
+2651,9
@@
static int nv_request_irq(struct net_device *dev, int intr_test)
} else {
/* Request irq for all interrupts */
if ((!intr_test &&
} else {
/* Request irq for all interrupts */
if ((!intr_test &&
- request_irq(np->msi_x_entry[NV_MSI_X_VECTOR_ALL].vector, &nv_nic_irq,
SA_SHIRQ
, dev->name, dev) != 0) ||
+ request_irq(np->msi_x_entry[NV_MSI_X_VECTOR_ALL].vector, &nv_nic_irq,
IRQF_SHARED
, dev->name, dev) != 0) ||
(intr_test &&
(intr_test &&
- request_irq(np->msi_x_entry[NV_MSI_X_VECTOR_ALL].vector, &nv_nic_irq_test,
SA_SHIRQ
, dev->name, dev) != 0)) {
+ request_irq(np->msi_x_entry[NV_MSI_X_VECTOR_ALL].vector, &nv_nic_irq_test,
IRQF_SHARED
, dev->name, dev) != 0)) {
printk(KERN_INFO "forcedeth: request_irq failed %d\n", ret);
pci_disable_msix(np->pci_dev);
np->msi_flags &= ~NV_MSI_X_ENABLED;
printk(KERN_INFO "forcedeth: request_irq failed %d\n", ret);
pci_disable_msix(np->pci_dev);
np->msi_flags &= ~NV_MSI_X_ENABLED;
@@
-2669,8
+2669,8
@@
static int nv_request_irq(struct net_device *dev, int intr_test)
if (ret != 0 && np->msi_flags & NV_MSI_CAPABLE) {
if ((ret = pci_enable_msi(np->pci_dev)) == 0) {
np->msi_flags |= NV_MSI_ENABLED;
if (ret != 0 && np->msi_flags & NV_MSI_CAPABLE) {
if ((ret = pci_enable_msi(np->pci_dev)) == 0) {
np->msi_flags |= NV_MSI_ENABLED;
- if ((!intr_test && request_irq(np->pci_dev->irq, &nv_nic_irq,
SA_SHIRQ
, dev->name, dev) != 0) ||
- (intr_test && request_irq(np->pci_dev->irq, &nv_nic_irq_test,
SA_SHIRQ
, dev->name, dev) != 0)) {
+ if ((!intr_test && request_irq(np->pci_dev->irq, &nv_nic_irq,
IRQF_SHARED
, dev->name, dev) != 0) ||
+ (intr_test && request_irq(np->pci_dev->irq, &nv_nic_irq_test,
IRQF_SHARED
, dev->name, dev) != 0)) {
printk(KERN_INFO "forcedeth: request_irq failed %d\n", ret);
pci_disable_msi(np->pci_dev);
np->msi_flags &= ~NV_MSI_ENABLED;
printk(KERN_INFO "forcedeth: request_irq failed %d\n", ret);
pci_disable_msi(np->pci_dev);
np->msi_flags &= ~NV_MSI_ENABLED;
@@
-2685,8
+2685,8
@@
static int nv_request_irq(struct net_device *dev, int intr_test)
}
}
if (ret != 0) {
}
}
if (ret != 0) {
- if ((!intr_test && request_irq(np->pci_dev->irq, &nv_nic_irq,
SA_SHIRQ
, dev->name, dev) != 0) ||
- (intr_test && request_irq(np->pci_dev->irq, &nv_nic_irq_test,
SA_SHIRQ
, dev->name, dev) != 0))
+ if ((!intr_test && request_irq(np->pci_dev->irq, &nv_nic_irq,
IRQF_SHARED
, dev->name, dev) != 0) ||
+ (intr_test && request_irq(np->pci_dev->irq, &nv_nic_irq_test,
IRQF_SHARED
, dev->name, dev) != 0))
goto out_err;
}
goto out_err;
}
diff --git
a/drivers/net/fs_enet/fs_enet-main.c
b/drivers/net/fs_enet/fs_enet-main.c
index e96a93c94941c94ca56a89fe8284907c67f12db9..f6abff5846b35fd1ca5f3bccec6c62d639129bc6 100644
(file)
--- a/
drivers/net/fs_enet/fs_enet-main.c
+++ b/
drivers/net/fs_enet/fs_enet-main.c
@@
-671,7
+671,7
@@
static int fs_request_irq(struct net_device *dev, int irq, const char *name,
struct fs_enet_private *fep = netdev_priv(dev);
(*fep->ops->pre_request_irq)(dev, irq);
struct fs_enet_private *fep = netdev_priv(dev);
(*fep->ops->pre_request_irq)(dev, irq);
- return request_irq(irq, irqf,
SA_SHIRQ
, name, dev);
+ return request_irq(irq, irqf,
IRQF_SHARED
, name, dev);
}
static void fs_free_irq(struct net_device *dev, int irq)
}
static void fs_free_irq(struct net_device *dev, int irq)
diff --git
a/drivers/net/gt96100eth.c
b/drivers/net/gt96100eth.c
index 2d24354046144870370d26c054fea3b6a7e57774..49dacc6e35aaf8f37dbcca1eb3eeff7237479a89 100644
(file)
--- a/
drivers/net/gt96100eth.c
+++ b/
drivers/net/gt96100eth.c
@@
-1030,7
+1030,7
@@
gt96100_open(struct net_device *dev)
}
if ((retval = request_irq(dev->irq, >96100_interrupt,
}
if ((retval = request_irq(dev->irq, >96100_interrupt,
-
SA_SHIRQ
, dev->name, dev))) {
+
IRQF_SHARED
, dev->name, dev))) {
err("unable to get IRQ %d\n", dev->irq);
return retval;
}
err("unable to get IRQ %d\n", dev->irq);
return retval;
}
diff --git
a/drivers/net/hamachi.c
b/drivers/net/hamachi.c
index 0ea4cb4a0d80aa1f0735f904a728ff09345d6089..7bcd939c6edda2a75a704f7f254ae5292a59a9c0 100644
(file)
--- a/
drivers/net/hamachi.c
+++ b/
drivers/net/hamachi.c
@@
-871,7
+871,7
@@
static int hamachi_open(struct net_device *dev)
u32 rx_int_var, tx_int_var;
u16 fifo_info;
u32 rx_int_var, tx_int_var;
u16 fifo_info;
- i = request_irq(dev->irq, &hamachi_interrupt,
SA_SHIRQ
, dev->name, dev);
+ i = request_irq(dev->irq, &hamachi_interrupt,
IRQF_SHARED
, dev->name, dev);
if (i)
return i;
if (i)
return i;
diff --git
a/drivers/net/hamradio/baycom_ser_fdx.c
b/drivers/net/hamradio/baycom_ser_fdx.c
index 232793d2ce6b0a46bf7d4a1a04e6683ac7624d14..55906c7b4bb12e25c877225901a83543dd0ccf12 100644
(file)
--- a/
drivers/net/hamradio/baycom_ser_fdx.c
+++ b/
drivers/net/hamradio/baycom_ser_fdx.c
@@
-434,7
+434,7
@@
static int ser12_open(struct net_device *dev)
outb(0, FCR(dev->base_addr)); /* disable FIFOs */
outb(0x0d, MCR(dev->base_addr));
outb(0, IER(dev->base_addr));
outb(0, FCR(dev->base_addr)); /* disable FIFOs */
outb(0x0d, MCR(dev->base_addr));
outb(0, IER(dev->base_addr));
- if (request_irq(dev->irq, ser12_interrupt,
SA_INTERRUPT | SA_SHIRQ
,
+ if (request_irq(dev->irq, ser12_interrupt,
IRQF_DISABLED | IRQF_SHARED
,
"baycom_ser_fdx", dev)) {
release_region(dev->base_addr, SER12_EXTENT);
return -EBUSY;
"baycom_ser_fdx", dev)) {
release_region(dev->base_addr, SER12_EXTENT);
return -EBUSY;
diff --git
a/drivers/net/hamradio/baycom_ser_hdx.c
b/drivers/net/hamradio/baycom_ser_hdx.c
index be596a3eb3fd9b164b6107410498d4dde7a76ace..de95de8983dae4a46c78013ca2eb5604ff87f318 100644
(file)
--- a/
drivers/net/hamradio/baycom_ser_hdx.c
+++ b/
drivers/net/hamradio/baycom_ser_hdx.c
@@
-488,7
+488,7
@@
static int ser12_open(struct net_device *dev)
outb(0, FCR(dev->base_addr)); /* disable FIFOs */
outb(0x0d, MCR(dev->base_addr));
outb(0, IER(dev->base_addr));
outb(0, FCR(dev->base_addr)); /* disable FIFOs */
outb(0x0d, MCR(dev->base_addr));
outb(0, IER(dev->base_addr));
- if (request_irq(dev->irq, ser12_interrupt,
SA_INTERRUPT | SA_SHIRQ
,
+ if (request_irq(dev->irq, ser12_interrupt,
IRQF_DISABLED | IRQF_SHARED
,
"baycom_ser12", dev)) {
release_region(dev->base_addr, SER12_EXTENT);
return -EBUSY;
"baycom_ser12", dev)) {
release_region(dev->base_addr, SER12_EXTENT);
return -EBUSY;
diff --git
a/drivers/net/hamradio/scc.c
b/drivers/net/hamradio/scc.c
index b9b10caa031cbd3cc75575e1d301e393a4e17ff0..df4b68142ac7b6dfdd1e43640ecfd83898f2f318 100644
(file)
--- a/
drivers/net/hamradio/scc.c
+++ b/
drivers/net/hamradio/scc.c
@@
-1736,7
+1736,7
@@
static int scc_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
if (!Ivec[hwcfg.irq].used && hwcfg.irq)
{
if (!Ivec[hwcfg.irq].used && hwcfg.irq)
{
- if (request_irq(hwcfg.irq, scc_isr,
SA_INTERRUPT
, "AX.25 SCC", NULL))
+ if (request_irq(hwcfg.irq, scc_isr,
IRQF_DISABLED
, "AX.25 SCC", NULL))
printk(KERN_WARNING "z8530drv: warning, cannot get IRQ %d\n", hwcfg.irq);
else
Ivec[hwcfg.irq].used = 1;
printk(KERN_WARNING "z8530drv: warning, cannot get IRQ %d\n", hwcfg.irq);
else
Ivec[hwcfg.irq].used = 1;
diff --git
a/drivers/net/hamradio/yam.c
b/drivers/net/hamradio/yam.c
index dd2f11c98530e4d5b8e39be445bec4d2c4007b31..f98f5777dfbb7807729e20c79651ee8c7291e1bb 100644
(file)
--- a/
drivers/net/hamradio/yam.c
+++ b/
drivers/net/hamradio/yam.c
@@
-873,7
+873,7
@@
static int yam_open(struct net_device *dev)
goto out_release_base;
}
outb(0, IER(dev->base_addr));
goto out_release_base;
}
outb(0, IER(dev->base_addr));
- if (request_irq(dev->irq, yam_interrupt,
SA_INTERRUPT | SA_SHIRQ
, dev->name, dev)) {
+ if (request_irq(dev->irq, yam_interrupt,
IRQF_DISABLED | IRQF_SHARED
, dev->name, dev)) {
printk(KERN_ERR "%s: irq %d busy\n", dev->name, dev->irq);
ret = -EBUSY;
goto out_release_base;
printk(KERN_ERR "%s: irq %d busy\n", dev->name, dev->irq);
ret = -EBUSY;
goto out_release_base;
diff --git
a/drivers/net/hp100.c
b/drivers/net/hp100.c
index dd1dc32dc98dc3181db5bb41be53f550bd3e1844..e7d9bf330287b504958b647e9e262440750c3a64 100644
(file)
--- a/
drivers/net/hp100.c
+++ b/
drivers/net/hp100.c
@@
-1079,7
+1079,7
@@
static int hp100_open(struct net_device *dev)
/* New: if bus is PCI or EISA, interrupts might be shared interrupts */
if (request_irq(dev->irq, hp100_interrupt,
lp->bus == HP100_BUS_PCI || lp->bus ==
/* New: if bus is PCI or EISA, interrupts might be shared interrupts */
if (request_irq(dev->irq, hp100_interrupt,
lp->bus == HP100_BUS_PCI || lp->bus ==
- HP100_BUS_EISA ?
SA_SHIRQ : SA_INTERRUPT
,
+ HP100_BUS_EISA ?
IRQF_SHARED : IRQF_DISABLED
,
"hp100", dev)) {
printk("hp100: %s: unable to get IRQ %d\n", dev->name, dev->irq);
return -EAGAIN;
"hp100", dev)) {
printk("hp100: %s: unable to get IRQ %d\n", dev->name, dev->irq);
return -EAGAIN;
diff --git
a/drivers/net/hydra.c
b/drivers/net/hydra.c
index d9fb8e74e631d7e019e9d61fb30a04412b3c3be9..91326ea3e12b3ce9a2393020039aff9c9d55954e 100644
(file)
--- a/
drivers/net/hydra.c
+++ b/
drivers/net/hydra.c
@@
-117,7
+117,7
@@
static int __devinit hydra_init(struct zorro_dev *z)
dev->irq = IRQ_AMIGA_PORTS;
/* Install the Interrupt handler */
dev->irq = IRQ_AMIGA_PORTS;
/* Install the Interrupt handler */
- if (request_irq(IRQ_AMIGA_PORTS, ei_interrupt,
SA_SHIRQ
, "Hydra Ethernet",
+ if (request_irq(IRQ_AMIGA_PORTS, ei_interrupt,
IRQF_SHARED
, "Hydra Ethernet",
dev)) {
free_netdev(dev);
return -EAGAIN;
dev)) {
free_netdev(dev);
return -EAGAIN;
diff --git
a/drivers/net/ibmlana.c
b/drivers/net/ibmlana.c
index 51fd51609ea9308af6b7e7755cc058dcd8b81905..2a95d72fa593d9631afc7ccc88d76cf76dbb2498 100644
(file)
--- a/
drivers/net/ibmlana.c
+++ b/
drivers/net/ibmlana.c
@@
-782,7
+782,7
@@
static int ibmlana_open(struct net_device *dev)
/* register resources - only necessary for IRQ */
/* register resources - only necessary for IRQ */
- result = request_irq(priv->realirq, irq_handler,
SA_SHIRQ | SA
_SAMPLE_RANDOM, dev->name, dev);
+ result = request_irq(priv->realirq, irq_handler,
IRQF_SHARED | IRQF
_SAMPLE_RANDOM, dev->name, dev);
if (result != 0) {
printk(KERN_ERR "%s: failed to register irq %d\n", dev->name, dev->irq);
return result;
if (result != 0) {
printk(KERN_ERR "%s: failed to register irq %d\n", dev->name, dev->irq);
return result;
diff --git
a/drivers/net/ioc3-eth.c
b/drivers/net/ioc3-eth.c
index dbf67750d89918849298e82fb4e4b3cec4368ec0..68d8af7df08e31fe6e1bee61f7c495782ceba1ec 100644
(file)
--- a/
drivers/net/ioc3-eth.c
+++ b/
drivers/net/ioc3-eth.c
@@
-1063,7
+1063,7
@@
static int ioc3_open(struct net_device *dev)
{
struct ioc3_private *ip = netdev_priv(dev);
{
struct ioc3_private *ip = netdev_priv(dev);
- if (request_irq(dev->irq, ioc3_interrupt,
SA_SHIRQ
, ioc3_str, dev)) {
+ if (request_irq(dev->irq, ioc3_interrupt,
IRQF_SHARED
, ioc3_str, dev)) {
printk(KERN_ERR "%s: Can't get irq %d\n", dev->name, dev->irq);
return -EAGAIN;
printk(KERN_ERR "%s: Can't get irq %d\n", dev->name, dev->irq);
return -EAGAIN;
diff --git
a/drivers/net/irda/donauboe.c
b/drivers/net/irda/donauboe.c
index 910c0cab35b02a7d2b939779ec9a04aff2cd30e0..33c07d5275da22b3ff719b6e66d4cb06167172b6 100644
(file)
--- a/
drivers/net/irda/donauboe.c
+++ b/
drivers/net/irda/donauboe.c
@@
-1372,7
+1372,7
@@
toshoboe_net_open (struct net_device *dev)
return 0;
if (request_irq (self->io.irq, toshoboe_interrupt,
return 0;
if (request_irq (self->io.irq, toshoboe_interrupt,
-
SA_SHIRQ | SA_INTERRUPT
, dev->name, (void *) self))
+
IRQF_SHARED | IRQF_DISABLED
, dev->name, (void *) self))
{
return -EAGAIN;
}
{
return -EAGAIN;
}
@@
-1573,7
+1573,7
@@
toshoboe_open (struct pci_dev *pci_dev, const struct pci_device_id *pdid)
self->io.fir_base = self->base;
self->io.fir_ext = OBOE_IO_EXTENT;
self->io.irq = pci_dev->irq;
self->io.fir_base = self->base;
self->io.fir_ext = OBOE_IO_EXTENT;
self->io.irq = pci_dev->irq;
- self->io.irqflags =
SA_SHIRQ | SA_INTERRUPT
;
+ self->io.irqflags =
IRQF_SHARED | IRQF_DISABLED
;
self->speed = self->io.speed = 9600;
self->async = 0;
self->speed = self->io.speed = 9600;
self->async = 0;
diff --git
a/drivers/net/irda/vlsi_ir.c
b/drivers/net/irda/vlsi_ir.c
index b9f28b14b3aee58877b872d8aedd3e7faca304b5..92d646cc9edcfc2e773332ce71b722b6be46b3c0 100644
(file)
--- a/
drivers/net/irda/vlsi_ir.c
+++ b/
drivers/net/irda/vlsi_ir.c
@@
-1517,7
+1517,7
@@
static int vlsi_open(struct net_device *ndev)
outb(IRINTR_INT_MASK, ndev->base_addr+VLSI_PIO_IRINTR);
outb(IRINTR_INT_MASK, ndev->base_addr+VLSI_PIO_IRINTR);
- if (request_irq(ndev->irq, vlsi_interrupt,
SA_SHIRQ
,
+ if (request_irq(ndev->irq, vlsi_interrupt,
IRQF_SHARED
,
drivername, ndev)) {
IRDA_WARNING("%s: couldn't get IRQ: %d\n",
__FUNCTION__, ndev->irq);
drivername, ndev)) {
IRDA_WARNING("%s: couldn't get IRQ: %d\n",
__FUNCTION__, ndev->irq);
diff --git
a/drivers/net/ixgb/ixgb_main.c
b/drivers/net/ixgb/ixgb_main.c
index 8bb32f94699371b815b2f61a9e2aa676270c1cf5..b91e082483f63067a976b207f39ff806eeeb2172 100644
(file)
--- a/
drivers/net/ixgb/ixgb_main.c
+++ b/
drivers/net/ixgb/ixgb_main.c
@@
-253,7
+253,7
@@
ixgb_up(struct ixgb_adapter *adapter)
#endif
if((err = request_irq(adapter->pdev->irq, &ixgb_intr,
#endif
if((err = request_irq(adapter->pdev->irq, &ixgb_intr,
-
SA_SHIRQ | SA
_SAMPLE_RANDOM,
+
IRQF_SHARED | IRQF
_SAMPLE_RANDOM,
netdev->name, netdev))) {
DPRINTK(PROBE, ERR,
"Unable to allocate interrupt Error: %d\n", err);
netdev->name, netdev))) {
DPRINTK(PROBE, ERR,
"Unable to allocate interrupt Error: %d\n", err);
diff --git
a/drivers/net/ixp2000/ixpdev.c
b/drivers/net/ixp2000/ixpdev.c
index 99229a0456d95b552ba3e5e80c3bb4bca19ef644..6eeb965b4d72b9214a3edddbfc52f6b8f7f21394 100644
(file)
--- a/
drivers/net/ixp2000/ixpdev.c
+++ b/
drivers/net/ixp2000/ixpdev.c
@@
-235,7
+235,7
@@
static int ixpdev_open(struct net_device *dev)
if (!nds_open++) {
err = request_irq(IRQ_IXP2000_THDA0, ixpdev_interrupt,
if (!nds_open++) {
err = request_irq(IRQ_IXP2000_THDA0, ixpdev_interrupt,
-
SA_SHIRQ
, "ixp2000_eth", nds);
+
IRQF_SHARED
, "ixp2000_eth", nds);
if (err) {
nds_open--;
return err;
if (err) {
nds_open--;
return err;
diff --git
a/drivers/net/jazzsonic.c
b/drivers/net/jazzsonic.c
index 272d331d29cd5a6a6363861ca0b1f91cba5ca33a..661d75b4cad205a65dcd6e42b54eaccf07f0a9c7 100644
(file)
--- a/
drivers/net/jazzsonic.c
+++ b/
drivers/net/jazzsonic.c
@@
-260,7
+260,7
@@
MODULE_DESCRIPTION("Jazz SONIC ethernet driver");
module_param(sonic_debug, int, 0);
MODULE_PARM_DESC(sonic_debug, "jazzsonic debug level (1-4)");
module_param(sonic_debug, int, 0);
MODULE_PARM_DESC(sonic_debug, "jazzsonic debug level (1-4)");
-#define SONIC_IRQ_FLAG
SA_INTERRUPT
+#define SONIC_IRQ_FLAG
IRQF_DISABLED
#include "sonic.c"
#include "sonic.c"
diff --git
a/drivers/net/lp486e.c
b/drivers/net/lp486e.c
index bf3f343ae7153dc56bc9107da56f4cdf4f3bcdf1..b783a6984abc0efd6f88ab8e814a70adc3656fc9 100644
(file)
--- a/
drivers/net/lp486e.c
+++ b/
drivers/net/lp486e.c
@@
-851,7
+851,7
@@
static int i596_open(struct net_device *dev)
{
int i;
{
int i;
- i = request_irq(dev->irq, &i596_interrupt,
SA_SHIRQ
, dev->name, dev);
+ i = request_irq(dev->irq, &i596_interrupt,
IRQF_SHARED
, dev->name, dev);
if (i) {
printk(KERN_ERR "%s: IRQ %d not free\n", dev->name, dev->irq);
return i;
if (i) {
printk(KERN_ERR "%s: IRQ %d not free\n", dev->name, dev->irq);
return i;
diff --git
a/drivers/net/mipsnet.c
b/drivers/net/mipsnet.c
index bbffb585b3b383a4582c22ab2078dafd471f1f14..07e58f4a29164c6ea76f6a91c9151cfbb0c9ace9 100644
(file)
--- a/
drivers/net/mipsnet.c
+++ b/
drivers/net/mipsnet.c
@@
-179,7
+179,7
@@
static int mipsnet_open(struct net_device *dev)
pr_debug("%s: mipsnet_open\n", dev->name);
err = request_irq(dev->irq, &mipsnet_interrupt,
pr_debug("%s: mipsnet_open\n", dev->name);
err = request_irq(dev->irq, &mipsnet_interrupt,
-
SA_SHIRQ
, dev->name, (void *) dev);
+
IRQF_SHARED
, dev->name, (void *) dev);
if (err) {
pr_debug("%s: %s(): can't get irq %d\n",
if (err) {
pr_debug("%s: %s(): can't get irq %d\n",
diff --git
a/drivers/net/mv643xx_eth.c
b/drivers/net/mv643xx_eth.c
index 625ff61c9988e7e0519c3dda2ba82f59cbc33d53..760c61b9886709515efb39e2fefbc4d41ce0a3e7 100644
(file)
--- a/
drivers/net/mv643xx_eth.c
+++ b/
drivers/net/mv643xx_eth.c
@@
-778,7
+778,7
@@
static int mv643xx_eth_open(struct net_device *dev)
int err;
err = request_irq(dev->irq, mv643xx_eth_int_handler,
int err;
err = request_irq(dev->irq, mv643xx_eth_int_handler,
-
SA_SHIRQ | SA
_SAMPLE_RANDOM, dev->name, dev);
+
IRQF_SHARED | IRQF
_SAMPLE_RANDOM, dev->name, dev);
if (err) {
printk(KERN_ERR "Can not assign IRQ number to MV643XX_eth%d\n",
port_num);
if (err) {
printk(KERN_ERR "Can not assign IRQ number to MV643XX_eth%d\n",
port_num);
diff --git
a/drivers/net/myri10ge/myri10ge.c
b/drivers/net/myri10ge/myri10ge.c
index dbdf189436fab53b4d1a5fd8fa4a24180b2ef4f6..72aad42db7b46039bce72bd5de9fd7e644752130 100644
(file)
--- a/
drivers/net/myri10ge/myri10ge.c
+++ b/
drivers/net/myri10ge/myri10ge.c
@@
-2413,7
+2413,7
@@
static int myri10ge_resume(struct pci_dev *pdev)
pci_enable_device(pdev);
pci_set_master(pdev);
pci_enable_device(pdev);
pci_set_master(pdev);
- status = request_irq(pdev->irq, myri10ge_intr,
SA_SHIRQ
,
+ status = request_irq(pdev->irq, myri10ge_intr,
IRQF_SHARED
,
netdev->name, mgp);
if (status != 0) {
dev_err(&pdev->dev, "failed to allocate IRQ\n");
netdev->name, mgp);
if (status != 0) {
dev_err(&pdev->dev, "failed to allocate IRQ\n");
@@
-2694,7
+2694,7
@@
static int myri10ge_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
mgp->msi_enabled = 1;
}
mgp->msi_enabled = 1;
}
- status = request_irq(pdev->irq, myri10ge_intr,
SA_SHIRQ
,
+ status = request_irq(pdev->irq, myri10ge_intr,
IRQF_SHARED
,
netdev->name, mgp);
if (status != 0) {
dev_err(&pdev->dev, "failed to allocate IRQ\n");
netdev->name, mgp);
if (status != 0) {
dev_err(&pdev->dev, "failed to allocate IRQ\n");
diff --git
a/drivers/net/myri_sbus.c
b/drivers/net/myri_sbus.c
index 19981065efb437507048c91b9eeac514f4604c3f..1b965a2b56e4fc22e0de85e5a9c2f0fbf60fe5ae 100644
(file)
--- a/
drivers/net/myri_sbus.c
+++ b/
drivers/net/myri_sbus.c
@@
-1069,7
+1069,7
@@
static int __init myri_ether_init(struct sbus_dev *sdev)
/* Register interrupt handler now. */
DET(("Requesting MYRIcom IRQ line.\n"));
if (request_irq(dev->irq, &myri_interrupt,
/* Register interrupt handler now. */
DET(("Requesting MYRIcom IRQ line.\n"));
if (request_irq(dev->irq, &myri_interrupt,
-
SA_SHIRQ
, "MyriCOM Ethernet", (void *) dev)) {
+
IRQF_SHARED
, "MyriCOM Ethernet", (void *) dev)) {
printk("MyriCOM: Cannot register interrupt handler.\n");
goto err;
}
printk("MyriCOM: Cannot register interrupt handler.\n");
goto err;
}
diff --git
a/drivers/net/natsemi.c
b/drivers/net/natsemi.c
index 438c63f940b9a27e129005f445d179d92aaf78ce..9df2628be1e733add4e8b55e92217f52aa0583fa 100644
(file)
--- a/
drivers/net/natsemi.c
+++ b/
drivers/net/natsemi.c
@@
-1574,7
+1574,7
@@
static int netdev_open(struct net_device *dev)
/* Reset the chip, just in case. */
natsemi_reset(dev);
/* Reset the chip, just in case. */
natsemi_reset(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) return i;
if (netif_msg_ifup(np))
if (i) return i;
if (netif_msg_ifup(np))
diff --git
a/drivers/net/ne2k-pci.c
b/drivers/net/ne2k-pci.c
index ced9fdb8335cc4225639cf49d67612d066833a31..fa50eb8894089dea2d47bb87fe3f7ca819862b71 100644
(file)
--- a/
drivers/net/ne2k-pci.c
+++ b/
drivers/net/ne2k-pci.c
@@
-420,7
+420,7
@@
static int ne2k_pci_set_fdx(struct net_device *dev)
static int ne2k_pci_open(struct net_device *dev)
{
static int ne2k_pci_open(struct net_device *dev)
{
- int ret = request_irq(dev->irq, ei_interrupt,
SA_SHIRQ
, dev->name, dev);
+ int ret = request_irq(dev->irq, ei_interrupt,
IRQF_SHARED
, dev->name, dev);
if (ret)
return ret;
if (ret)
return ret;
diff --git
a/drivers/net/netx-eth.c
b/drivers/net/netx-eth.c
index b92430c4e3accfe82a949c1150af0714b3588b6b..b1311ae82675035a6725dece3f017be2b395dd4e 100644
(file)
--- a/
drivers/net/netx-eth.c
+++ b/
drivers/net/netx-eth.c
@@
-223,7
+223,7
@@
static int netx_eth_open(struct net_device *ndev)
struct netx_eth_priv *priv = netdev_priv(ndev);
if (request_irq
struct netx_eth_priv *priv = netdev_priv(ndev);
if (request_irq
- (ndev->irq, &netx_eth_interrupt,
SA_SHIRQ
, ndev->name, ndev))
+ (ndev->irq, &netx_eth_interrupt,
IRQF_SHARED
, ndev->name, ndev))
return -EAGAIN;
writel(ndev->dev_addr[0] |
return -EAGAIN;
writel(ndev->dev_addr[0] |
diff --git
a/drivers/net/ns83820.c
b/drivers/net/ns83820.c
index deedd7b2af5d372bc6c581a5b68daa5b56e0e862..70429108c40d30e83f16c7d8fadb4e6a026480ea 100644
(file)
--- a/
drivers/net/ns83820.c
+++ b/
drivers/net/ns83820.c
@@
-1881,7
+1881,7
@@
static int __devinit ns83820_init_one(struct pci_dev *pci_dev, const struct pci_
dev->IMR_cache = 0;
dev->IMR_cache = 0;
- err = request_irq(pci_dev->irq, ns83820_irq,
SA_SHIRQ
,
+ err = request_irq(pci_dev->irq, ns83820_irq,
IRQF_SHARED
,
DRV_NAME, ndev);
if (err) {
printk(KERN_INFO "ns83820: unable to register irq %d\n",
DRV_NAME, ndev);
if (err) {
printk(KERN_INFO "ns83820: unable to register irq %d\n",
diff --git
a/drivers/net/pci-skeleton.c
b/drivers/net/pci-skeleton.c
index 978b95afc7216d6dc83c5af971b536085a14fe2d..3388ee1313ea33dc952bf8cefc2bb085b1f7ed09 100644
(file)
--- a/
drivers/net/pci-skeleton.c
+++ b/
drivers/net/pci-skeleton.c
@@
-1075,7
+1075,7
@@
static int netdrv_open (struct net_device *dev)
DPRINTK ("ENTER\n");
DPRINTK ("ENTER\n");
- retval = request_irq (dev->irq, netdrv_interrupt,
SA_SHIRQ
, dev->name, dev);
+ retval = request_irq (dev->irq, netdrv_interrupt,
IRQF_SHARED
, dev->name, dev);
if (retval) {
DPRINTK ("EXIT, returning %d\n", retval);
return retval;
if (retval) {
DPRINTK ("EXIT, returning %d\n", retval);
return retval;
diff --git
a/drivers/net/pcmcia/axnet_cs.c
b/drivers/net/pcmcia/axnet_cs.c
index 2ea66aca648b417ae0109ae132921965b9615eb9..297e9f8053663e0efefda780c0d7978669ce5b64 100644
(file)
--- a/
drivers/net/pcmcia/axnet_cs.c
+++ b/
drivers/net/pcmcia/axnet_cs.c
@@
-535,7
+535,7
@@
static int axnet_open(struct net_device *dev)
link->open++;
link->open++;
- request_irq(dev->irq, ei_irq_wrapper,
SA_SHIRQ
, "axnet_cs", dev);
+ request_irq(dev->irq, ei_irq_wrapper,
IRQF_SHARED
, "axnet_cs", dev);
info->link_status = 0x00;
init_timer(&info->watchdog);
info->link_status = 0x00;
init_timer(&info->watchdog);
diff --git
a/drivers/net/pcmcia/pcnet_cs.c
b/drivers/net/pcmcia/pcnet_cs.c
index 661bfe54ff5d8543f7a0d99b4ecd9adca3afd49f..0ecebfc31f073be959ebf9ca646bd4c6a858b0f2 100644
(file)
--- a/
drivers/net/pcmcia/pcnet_cs.c
+++ b/
drivers/net/pcmcia/pcnet_cs.c
@@
-998,7
+998,7
@@
static int pcnet_open(struct net_device *dev)
link->open++;
set_misc_reg(dev);
link->open++;
set_misc_reg(dev);
- request_irq(dev->irq, ei_irq_wrapper,
SA_SHIRQ
, dev_info, dev);
+ request_irq(dev->irq, ei_irq_wrapper,
IRQF_SHARED
, dev_info, dev);
info->phy_id = info->eth_phy;
info->link_status = 0x00;
info->phy_id = info->eth_phy;
info->link_status = 0x00;
diff --git
a/drivers/net/pcnet32.c
b/drivers/net/pcnet32.c
index 0e01c75da4296647884603414f9002fea6834e2a..d768f3d1ac28e39c2688896016f173e3589e934b 100644
(file)
--- a/
drivers/net/pcnet32.c
+++ b/
drivers/net/pcnet32.c
@@
-1541,7
+1541,7
@@
static int pcnet32_open(struct net_device *dev)
unsigned long flags;
if (request_irq(dev->irq, &pcnet32_interrupt,
unsigned long flags;
if (request_irq(dev->irq, &pcnet32_interrupt,
- lp->shared_irq ?
SA_SHIRQ
: 0, dev->name,
+ lp->shared_irq ?
IRQF_SHARED
: 0, dev->name,
(void *)dev)) {
return -EAGAIN;
}
(void *)dev)) {
return -EAGAIN;
}
diff --git
a/drivers/net/phy/phy.c
b/drivers/net/phy/phy.c
index 44bcd3eb2b8370126407c1692cea340757e4cd56..7d5c2233c252fac78c386f6b6e3cc9bc4f21b88e 100644
(file)
--- a/
drivers/net/phy/phy.c
+++ b/
drivers/net/phy/phy.c
@@
-556,7
+556,7
@@
int phy_start_interrupts(struct phy_device *phydev)
INIT_WORK(&phydev->phy_queue, phy_change, phydev);
if (request_irq(phydev->irq, phy_interrupt,
INIT_WORK(&phydev->phy_queue, phy_change, phydev);
if (request_irq(phydev->irq, phy_interrupt,
-
SA_SHIRQ
,
+
IRQF_SHARED
,
"phy_interrupt",
phydev) < 0) {
printk(KERN_WARNING "%s: Can't get IRQ %d (PHY)\n",
"phy_interrupt",
phydev) < 0) {
printk(KERN_WARNING "%s: Can't get IRQ %d (PHY)\n",
diff --git
a/drivers/net/r8169.c
b/drivers/net/r8169.c
index 12d1cb289bb0849ee6bae315a48492595b9261fb..16a0ef1b1369cd27cad05af34fca13dcc7886b0a 100644
(file)
--- a/
drivers/net/r8169.c
+++ b/
drivers/net/r8169.c
@@
-1726,7
+1726,7
@@
static int rtl8169_open(struct net_device *dev)
rtl8169_set_rxbufsize(tp, dev);
retval =
rtl8169_set_rxbufsize(tp, dev);
retval =
- request_irq(dev->irq, rtl8169_interrupt,
SA_SHIRQ
, dev->name, dev);
+ request_irq(dev->irq, rtl8169_interrupt,
IRQF_SHARED
, dev->name, dev);
if (retval < 0)
goto out;
if (retval < 0)
goto out;
diff --git
a/drivers/net/rrunner.c
b/drivers/net/rrunner.c
index 757c542ac40a27da6a32a522f1be4a329407abf4..c3ed734cbe39cdabd5713c5c1e2214e9827b9513 100644
(file)
--- a/
drivers/net/rrunner.c
+++ b/
drivers/net/rrunner.c
@@
-1252,7
+1252,7
@@
static int rr_open(struct net_device *dev)
readl(®s->HostCtrl);
spin_unlock_irqrestore(&rrpriv->lock, flags);
readl(®s->HostCtrl);
spin_unlock_irqrestore(&rrpriv->lock, flags);
- if (request_irq(dev->irq, rr_interrupt,
SA_SHIRQ
, dev->name, dev)) {
+ if (request_irq(dev->irq, rr_interrupt,
IRQF_SHARED
, dev->name, dev)) {
printk(KERN_WARNING "%s: Requested IRQ %d is busy\n",
dev->name, dev->irq);
ecode = -EAGAIN;
printk(KERN_WARNING "%s: Requested IRQ %d is busy\n",
dev->name, dev->irq);
ecode = -EAGAIN;
diff --git
a/drivers/net/s2io.c
b/drivers/net/s2io.c
index 001344c0763ed3eadba132cc37e6e6996145d0ef..c6b77acb35ef88ace82eb594e96adc6394cb1b4e 100644
(file)
--- a/
drivers/net/s2io.c
+++ b/
drivers/net/s2io.c
@@
-3761,7
+3761,7
@@
static int s2io_open(struct net_device *dev)
/* After proper initialization of H/W, register ISR */
if (sp->intr_type == MSI) {
err = request_irq((int) sp->pdev->irq, s2io_msi_handle,
/* After proper initialization of H/W, register ISR */
if (sp->intr_type == MSI) {
err = request_irq((int) sp->pdev->irq, s2io_msi_handle,
-
SA_SHIRQ
, sp->name, dev);
+
IRQF_SHARED
, sp->name, dev);
if (err) {
DBG_PRINT(ERR_DBG, "%s: MSI registration \
failed\n", dev->name);
if (err) {
DBG_PRINT(ERR_DBG, "%s: MSI registration \
failed\n", dev->name);
@@
-3799,7
+3799,7
@@
failed\n", dev->name, i);
}
}
if (sp->intr_type == INTA) {
}
}
if (sp->intr_type == INTA) {
- err = request_irq((int) sp->pdev->irq, s2io_isr,
SA_SHIRQ
,
+ err = request_irq((int) sp->pdev->irq, s2io_isr,
IRQF_SHARED
,
sp->name, dev);
if (err) {
DBG_PRINT(ERR_DBG, "%s: ISR registration failed\n",
sp->name, dev);
if (err) {
DBG_PRINT(ERR_DBG, "%s: ISR registration failed\n",
diff --git
a/drivers/net/sb1250-mac.c
b/drivers/net/sb1250-mac.c
index c7b5f0004e54fd5983ba135c0f8a183dfea21a0f..9ab1618e82a4a9e2a1ce1cfc0a39ec4bd921ceae 100644
(file)
--- a/
drivers/net/sb1250-mac.c
+++ b/
drivers/net/sb1250-mac.c
@@
-2450,7
+2450,7
@@
static int sbmac_open(struct net_device *dev)
*/
__raw_readq(sc->sbm_isr);
*/
__raw_readq(sc->sbm_isr);
- if (request_irq(dev->irq, &sbmac_intr,
SA_SHIRQ
, dev->name, dev))
+ if (request_irq(dev->irq, &sbmac_intr,
IRQF_SHARED
, dev->name, dev))
return -EBUSY;
/*
return -EBUSY;
/*
diff --git
a/drivers/net/sis190.c
b/drivers/net/sis190.c
index df39f34476550613891392a24e4df5e854a626ca..df0cbebb3277ac69a167ef62154ab2ccf00a33ce 100644
(file)
--- a/
drivers/net/sis190.c
+++ b/
drivers/net/sis190.c
@@
-1054,7
+1054,7
@@
static int sis190_open(struct net_device *dev)
sis190_request_timer(dev);
sis190_request_timer(dev);
- rc = request_irq(dev->irq, sis190_interrupt,
SA_SHIRQ
, dev->name, dev);
+ rc = request_irq(dev->irq, sis190_interrupt,
IRQF_SHARED
, dev->name, dev);
if (rc < 0)
goto err_release_timer_2;
if (rc < 0)
goto err_release_timer_2;
diff --git
a/drivers/net/sis900.c
b/drivers/net/sis900.c
index d058741722091c3555f1b3cf0f399c0a67b83a6e..29ee7ffedfff0f060dd3dfd8b3423d8af71ba7b1 100644
(file)
--- a/
drivers/net/sis900.c
+++ b/
drivers/net/sis900.c
@@
-1013,7
+1013,7
@@
sis900_open(struct net_device *net_dev)
/* Equalizer workaround Rule */
sis630_set_eq(net_dev, sis_priv->chipset_rev);
/* Equalizer workaround Rule */
sis630_set_eq(net_dev, sis_priv->chipset_rev);
- ret = request_irq(net_dev->irq, &sis900_interrupt,
SA_SHIRQ
,
+ ret = request_irq(net_dev->irq, &sis900_interrupt,
IRQF_SHARED
,
net_dev->name, net_dev);
if (ret)
return ret;
net_dev->name, net_dev);
if (ret)
return ret;
diff --git
a/drivers/net/sk98lin/skge.c
b/drivers/net/sk98lin/skge.c
index f3efbd177ae7deda0b3a72979655f87a0a1d418d..ee62845d3ac9d9140eea0e2a8c0e801ce75a9682 100644
(file)
--- a/
drivers/net/sk98lin/skge.c
+++ b/
drivers/net/sk98lin/skge.c
@@
-570,9
+570,9
@@
SK_BOOL DualNet;
spin_unlock_irqrestore(&pAC->SlowPathLock, Flags);
if (pAC->GIni.GIMacsFound == 2) {
spin_unlock_irqrestore(&pAC->SlowPathLock, Flags);
if (pAC->GIni.GIMacsFound == 2) {
- Ret = request_irq(dev->irq, SkGeIsr,
SA_SHIRQ
, "sk98lin", dev);
+ Ret = request_irq(dev->irq, SkGeIsr,
IRQF_SHARED
, "sk98lin", dev);
} else if (pAC->GIni.GIMacsFound == 1) {
} else if (pAC->GIni.GIMacsFound == 1) {
- Ret = request_irq(dev->irq, SkGeIsrOnePort,
SA_SHIRQ
,
+ Ret = request_irq(dev->irq, SkGeIsrOnePort,
IRQF_SHARED
,
"sk98lin", dev);
} else {
printk(KERN_WARNING "sk98lin: Illegal number of ports: %d\n",
"sk98lin", dev);
} else {
printk(KERN_WARNING "sk98lin: Illegal number of ports: %d\n",
@@
-5073,9
+5073,9
@@
static int skge_resume(struct pci_dev *pdev)
pci_enable_device(pdev);
pci_set_master(pdev);
if (pAC->GIni.GIMacsFound == 2)
pci_enable_device(pdev);
pci_set_master(pdev);
if (pAC->GIni.GIMacsFound == 2)
- ret = request_irq(dev->irq, SkGeIsr,
SA_SHIRQ
, "sk98lin", dev);
+ ret = request_irq(dev->irq, SkGeIsr,
IRQF_SHARED
, "sk98lin", dev);
else
else
- ret = request_irq(dev->irq, SkGeIsrOnePort,
SA_SHIRQ
, "sk98lin", dev);
+ ret = request_irq(dev->irq, SkGeIsrOnePort,
IRQF_SHARED
, "sk98lin", dev);
if (ret) {
printk(KERN_WARNING "sk98lin: unable to acquire IRQ %d\n", dev->irq);
pAC->AllocFlag &= ~SK_ALLOC_IRQ;
if (ret) {
printk(KERN_WARNING "sk98lin: unable to acquire IRQ %d\n", dev->irq);
pAC->AllocFlag &= ~SK_ALLOC_IRQ;
diff --git
a/drivers/net/sk_mca.c
b/drivers/net/sk_mca.c
index e5d6d95960c7b76a1c746e247170545fcf7ba4f7..799e0980193438ed599992b63b8d5997638dec57 100644
(file)
--- a/
drivers/net/sk_mca.c
+++ b/
drivers/net/sk_mca.c
@@
-824,7
+824,7
@@
static int skmca_open(struct net_device *dev)
/* register resources - only necessary for IRQ */
result =
request_irq(priv->realirq, irq_handler,
/* register resources - only necessary for IRQ */
result =
request_irq(priv->realirq, irq_handler,
-
SA_SHIRQ | SA
_SAMPLE_RANDOM, "sk_mca", dev);
+
IRQF_SHARED | IRQF
_SAMPLE_RANDOM, "sk_mca", dev);
if (result != 0) {
printk("%s: failed to register irq %d\n", dev->name,
dev->irq);
if (result != 0) {
printk("%s: failed to register irq %d\n", dev->name,
dev->irq);
diff --git
a/drivers/net/skfp/skfddi.c
b/drivers/net/skfp/skfddi.c
index c7fb6133047e097a9f0030570c5661d12825664a..b5714a60237d91ea37b874878d6835d60ade2fd5 100644
(file)
--- a/
drivers/net/skfp/skfddi.c
+++ b/
drivers/net/skfp/skfddi.c
@@
-497,7
+497,7
@@
static int skfp_open(struct net_device *dev)
PRINTK(KERN_INFO "entering skfp_open\n");
/* Register IRQ - support shared interrupts by passing device ptr */
PRINTK(KERN_INFO "entering skfp_open\n");
/* Register IRQ - support shared interrupts by passing device ptr */
- err = request_irq(dev->irq, (void *) skfp_interrupt,
SA_SHIRQ
,
+ err = request_irq(dev->irq, (void *) skfp_interrupt,
IRQF_SHARED
,
dev->name, dev);
if (err)
return err;
dev->name, dev);
if (err)
return err;
diff --git
a/drivers/net/skge.c
b/drivers/net/skge.c
index 82df13be3d4070be79dbcb414f4a34db11e0d45a..82200bfaa8ed2bb5bef5ea7f959d1a183887f234 100644
(file)
--- a/
drivers/net/skge.c
+++ b/
drivers/net/skge.c
@@
-3341,7
+3341,7
@@
static int __devinit skge_probe(struct pci_dev *pdev,
goto err_out_free_hw;
}
goto err_out_free_hw;
}
- err = request_irq(pdev->irq, skge_intr,
SA_SHIRQ
, DRV_NAME, hw);
+ err = request_irq(pdev->irq, skge_intr,
IRQF_SHARED
, DRV_NAME, hw);
if (err) {
printk(KERN_ERR PFX "%s: cannot assign irq %d\n",
pci_name(pdev), pdev->irq);
if (err) {
printk(KERN_ERR PFX "%s: cannot assign irq %d\n",
pci_name(pdev), pdev->irq);
diff --git
a/drivers/net/sky2.c
b/drivers/net/sky2.c
index 3f1b0fef13e7ca274b68a112f21bdd09af2c8b64..418f169a6a31e9f964964467b142e7691e7985ec 100644
(file)
--- a/
drivers/net/sky2.c
+++ b/
drivers/net/sky2.c
@@
-3188,7
+3188,7
@@
static int __devinit sky2_test_msi(struct sky2_hw *hw)
sky2_write32(hw, B0_IMSK, Y2_IS_IRQ_SW);
sky2_write32(hw, B0_IMSK, Y2_IS_IRQ_SW);
- err = request_irq(pdev->irq, sky2_test_intr,
SA_SHIRQ
, DRV_NAME, hw);
+ err = request_irq(pdev->irq, sky2_test_intr,
IRQF_SHARED
, DRV_NAME, hw);
if (err) {
printk(KERN_ERR PFX "%s: cannot assign irq %d\n",
pci_name(pdev), pdev->irq);
if (err) {
printk(KERN_ERR PFX "%s: cannot assign irq %d\n",
pci_name(pdev), pdev->irq);
@@
-3348,7
+3348,7
@@
static int __devinit sky2_probe(struct pci_dev *pdev,
goto err_out_unregister;
}
goto err_out_unregister;
}
- err = request_irq(pdev->irq, sky2_intr,
SA_SHIRQ
, DRV_NAME, hw);
+ err = request_irq(pdev->irq, sky2_intr,
IRQF_SHARED
, DRV_NAME, hw);
if (err) {
printk(KERN_ERR PFX "%s: cannot assign irq %d\n",
pci_name(pdev), pdev->irq);
if (err) {
printk(KERN_ERR PFX "%s: cannot assign irq %d\n",
pci_name(pdev), pdev->irq);
diff --git
a/drivers/net/smc-ultra32.c
b/drivers/net/smc-ultra32.c
index ff9bd97746dcb67d0a4dafeb30a782d2b025cfac..85be22a05973027782f17e243b9b891a2e736d73 100644
(file)
--- a/
drivers/net/smc-ultra32.c
+++ b/
drivers/net/smc-ultra32.c
@@
-290,7
+290,7
@@
out:
static int ultra32_open(struct net_device *dev)
{
int ioaddr = dev->base_addr - ULTRA32_NIC_OFFSET; /* ASIC addr */
static int ultra32_open(struct net_device *dev)
{
int ioaddr = dev->base_addr - ULTRA32_NIC_OFFSET; /* ASIC addr */
- int irq_flags = (inb(ioaddr + ULTRA32_CFG5) & 0x08) ? 0 :
SA_SHIRQ
;
+ int irq_flags = (inb(ioaddr + ULTRA32_CFG5) & 0x08) ? 0 :
IRQF_SHARED
;
int retval;
retval = request_irq(dev->irq, ei_interrupt, irq_flags, dev->name, dev);
int retval;
retval = request_irq(dev->irq, ei_interrupt, irq_flags, dev->name, dev);
diff --git
a/drivers/net/smc911x.c
b/drivers/net/smc911x.c
index bdd8702ead54578b300e1821604b3117403d3127..d37bd860b336937c8f50645efec075a581283673 100644
(file)
--- a/
drivers/net/smc911x.c
+++ b/
drivers/net/smc911x.c
@@
-2081,7
+2081,7
@@
static int __init smc911x_probe(struct net_device *dev, unsigned long ioaddr)
lp->ctl_rspeed = 100;
/* Grab the IRQ */
lp->ctl_rspeed = 100;
/* Grab the IRQ */
- retval = request_irq(dev->irq, &smc911x_interrupt,
SA_SHIRQ
, dev->name, dev);
+ retval = request_irq(dev->irq, &smc911x_interrupt,
IRQF_SHARED
, dev->name, dev);
if (retval)
goto err_out;
if (retval)
goto err_out;
diff --git
a/drivers/net/smc91x.h
b/drivers/net/smc91x.h
index bf776125ca38c86bab8e3468085aca9de4941194..b4028049ed764215b07255f40d111e61ae49f6c4 100644
(file)
--- a/
drivers/net/smc91x.h
+++ b/
drivers/net/smc91x.h
@@
-207,7
+207,7
@@
SMC_outw(u16 val, void __iomem *ioaddr, int reg)
machine_is_omap_h2() \
|| machine_is_omap_h3() \
|| (machine_is_omap_innovator() && !cpu_is_omap1510()) \
machine_is_omap_h2() \
|| machine_is_omap_h3() \
|| (machine_is_omap_innovator() && !cpu_is_omap1510()) \
- ) ?
SA_TRIGGER_FALLING : SA
_TRIGGER_RISING)
+ ) ?
IRQF_TRIGGER_FALLING : IRQF
_TRIGGER_RISING)
#elif defined(CONFIG_SH_SH4202_MICRODEV)
#elif defined(CONFIG_SH_SH4202_MICRODEV)
@@
-540,7
+540,7
@@
smc_pxa_dma_irq(int dma, void *dummy, struct pt_regs *regs)
#endif
#ifndef SMC_IRQ_FLAGS
#endif
#ifndef SMC_IRQ_FLAGS
-#define SMC_IRQ_FLAGS
SA
_TRIGGER_RISING
+#define SMC_IRQ_FLAGS
IRQF
_TRIGGER_RISING
#endif
#ifndef SMC_INTERRUPT_PREAMBLE
#endif
#ifndef SMC_INTERRUPT_PREAMBLE
diff --git
a/drivers/net/spider_net.c
b/drivers/net/spider_net.c
index e0b72676922c14bf5131388b68fdf685b7b47299..fb1d5a8a45cf996c47623402b9a406dd7df8fa56 100644
(file)
--- a/
drivers/net/spider_net.c
+++ b/
drivers/net/spider_net.c
@@
-1744,7
+1744,7
@@
spider_net_open(struct net_device *netdev)
result = -EBUSY;
if (request_irq(netdev->irq, spider_net_interrupt,
result = -EBUSY;
if (request_irq(netdev->irq, spider_net_interrupt,
-
SA_SHIRQ
, netdev->name, netdev))
+
IRQF_SHARED
, netdev->name, netdev))
goto register_int_failed;
spider_net_enable_card(card);
goto register_int_failed;
spider_net_enable_card(card);
diff --git
a/drivers/net/starfire.c
b/drivers/net/starfire.c
index f91be95356a4bac7430bf48cf216126bb9ddf35c..ed1f59901ff4e08fff80d45b85ade4f0d277f24c 100644
(file)
--- a/
drivers/net/starfire.c
+++ b/
drivers/net/starfire.c
@@
-1070,7
+1070,7
@@
static int netdev_open(struct net_device *dev)
/* Do we ever need to reset the chip??? */
/* Do we ever need to reset the chip??? */
- retval = request_irq(dev->irq, &intr_handler,
SA_SHIRQ
, dev->name, dev);
+ retval = request_irq(dev->irq, &intr_handler,
IRQF_SHARED
, dev->name, dev);
if (retval)
return retval;
if (retval)
return retval;
diff --git
a/drivers/net/sun3lance.c
b/drivers/net/sun3lance.c
index a2fad50437e67a319a7e727ef6a6c42400824747..2dcadb169a22ef562a8476e0bd7274fdb36894a2 100644
(file)
--- a/
drivers/net/sun3lance.c
+++ b/
drivers/net/sun3lance.c
@@
-341,7
+341,7
@@
static int __init lance_probe( struct net_device *dev)
REGA(CSR0) = CSR0_STOP;
REGA(CSR0) = CSR0_STOP;
- request_irq(LANCE_IRQ, lance_interrupt,
SA_INTERRUPT
, "SUN3 Lance", dev);
+ request_irq(LANCE_IRQ, lance_interrupt,
IRQF_DISABLED
, "SUN3 Lance", dev);
dev->irq = (unsigned short)LANCE_IRQ;
dev->irq = (unsigned short)LANCE_IRQ;
diff --git
a/drivers/net/sunbmac.c
b/drivers/net/sunbmac.c
index 7127f0f36f0e9d64e23003a6707e4c0f0294cc15..d46891510767578425bbc80a348223817e075f98 100644
(file)
--- a/
drivers/net/sunbmac.c
+++ b/
drivers/net/sunbmac.c
@@
-918,7
+918,7
@@
static int bigmac_open(struct net_device *dev)
struct bigmac *bp = (struct bigmac *) dev->priv;
int ret;
struct bigmac *bp = (struct bigmac *) dev->priv;
int ret;
- ret = request_irq(dev->irq, &bigmac_interrupt,
SA_SHIRQ
, dev->name, bp);
+ ret = request_irq(dev->irq, &bigmac_interrupt,
IRQF_SHARED
, dev->name, bp);
if (ret) {
printk(KERN_ERR "BIGMAC: Can't order irq %d to go.\n", dev->irq);
return ret;
if (ret) {
printk(KERN_ERR "BIGMAC: Can't order irq %d to go.\n", dev->irq);
return ret;
diff --git
a/drivers/net/sundance.c
b/drivers/net/sundance.c
index f13b2a195c708fe32d8c53d05988875a51bd52e1..643fceae3db5d8eb6a00686d39c37f56b3724725 100644
(file)
--- a/
drivers/net/sundance.c
+++ b/
drivers/net/sundance.c
@@
-870,7
+870,7
@@
static int netdev_open(struct net_device *dev)
/* Do we need to reset the chip??? */
/* Do we need to reset the chip??? */
- 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)
return i;
if (i)
return i;
diff --git
a/drivers/net/sungem.c
b/drivers/net/sungem.c
index 5248670d29f70e33c2af87939985b3c3c72cd4c4..b70bbd7489789f826fd969262dfa16912b565e65 100644
(file)
--- a/
drivers/net/sungem.c
+++ b/
drivers/net/sungem.c
@@
-2220,7
+2220,7
@@
static int gem_do_start(struct net_device *dev)
spin_unlock_irqrestore(&gp->lock, flags);
if (request_irq(gp->pdev->irq, gem_interrupt,
spin_unlock_irqrestore(&gp->lock, flags);
if (request_irq(gp->pdev->irq, gem_interrupt,
-
SA_SHIRQ
, dev->name, (void *)dev)) {
+
IRQF_SHARED
, dev->name, (void *)dev)) {
printk(KERN_ERR "%s: failed to request irq !\n", gp->dev->name);
spin_lock_irqsave(&gp->lock, flags);
printk(KERN_ERR "%s: failed to request irq !\n", gp->dev->name);
spin_lock_irqsave(&gp->lock, flags);
diff --git
a/drivers/net/sunhme.c
b/drivers/net/sunhme.c
index d85b83204f6b7c6acf0e534e207229ce980c5b16..8673fd4c08c7bfe76e5027a078d949a472fd0c78 100644
(file)
--- a/
drivers/net/sunhme.c
+++ b/
drivers/net/sunhme.c
@@
-2194,7
+2194,7
@@
static int happy_meal_open(struct net_device *dev)
*/
if ((hp->happy_flags & (HFLAG_QUATTRO|HFLAG_PCI)) != HFLAG_QUATTRO) {
if (request_irq(dev->irq, &happy_meal_interrupt,
*/
if ((hp->happy_flags & (HFLAG_QUATTRO|HFLAG_PCI)) != HFLAG_QUATTRO) {
if (request_irq(dev->irq, &happy_meal_interrupt,
-
SA_SHIRQ
, dev->name, (void *)dev)) {
+
IRQF_SHARED
, dev->name, (void *)dev)) {
HMD(("EAGAIN\n"));
printk(KERN_ERR "happy_meal(SBUS): Can't order irq %d to go.\n",
dev->irq);
HMD(("EAGAIN\n"));
printk(KERN_ERR "happy_meal(SBUS): Can't order irq %d to go.\n",
dev->irq);
@@
-2608,7
+2608,7
@@
static void __init quattro_sbus_register_irqs(void)
err = request_irq(sdev->irqs[0],
quattro_sbus_interrupt,
err = request_irq(sdev->irqs[0],
quattro_sbus_interrupt,
-
SA_SHIRQ
, "Quattro",
+
IRQF_SHARED
, "Quattro",
qp);
if (err != 0) {
printk(KERN_ERR "Quattro: Fatal IRQ registery error %d.\n", err);
qp);
if (err != 0) {
printk(KERN_ERR "Quattro: Fatal IRQ registery error %d.\n", err);
diff --git
a/drivers/net/sunlance.c
b/drivers/net/sunlance.c
index 5b0b60f4d20ecf452fcc2b7ecb82718ee8343fb2..1ef9fd39a79a9cfc3b1dacb6235088a0c0525e5d 100644
(file)
--- a/
drivers/net/sunlance.c
+++ b/
drivers/net/sunlance.c
@@
-930,7
+930,7
@@
static int lance_open(struct net_device *dev)
STOP_LANCE(lp);
STOP_LANCE(lp);
- if (request_irq(dev->irq, &lance_interrupt,
SA_SHIRQ
,
+ if (request_irq(dev->irq, &lance_interrupt,
IRQF_SHARED
,
lancestr, (void *) dev)) {
printk(KERN_ERR "Lance: Can't get irq %d\n", dev->irq);
return -EAGAIN;
lancestr, (void *) dev)) {
printk(KERN_ERR "Lance: Can't get irq %d\n", dev->irq);
return -EAGAIN;
diff --git
a/drivers/net/sunqe.c
b/drivers/net/sunqe.c
index 9da6d5b87173186987dadda983fe18abb16a955c..817a40b66638a2c268060dbd2cf0e54539b6bf91 100644
(file)
--- a/
drivers/net/sunqe.c
+++ b/
drivers/net/sunqe.c
@@
-811,7
+811,7
@@
static struct sunqec * __init get_qec(struct sbus_dev *child_sdev)
qec_init_once(qecp, qec_sdev);
if (request_irq(qec_sdev->irqs[0], &qec_interrupt,
qec_init_once(qecp, qec_sdev);
if (request_irq(qec_sdev->irqs[0], &qec_interrupt,
-
SA_SHIRQ
, "qec", (void *) qecp)) {
+
IRQF_SHARED
, "qec", (void *) qecp)) {
printk(KERN_ERR "qec: Can't register irq.\n");
goto fail;
}
printk(KERN_ERR "qec: Can't register irq.\n");
goto fail;
}
diff --git
a/drivers/net/tc35815.c
b/drivers/net/tc35815.c
index c2ec9fd8c31d1c3cb3ddbed9cf9167c12c1c4d26..8b53ded66d3714ba16541c3e475868edd5b1d60b 100644
(file)
--- a/
drivers/net/tc35815.c
+++ b/
drivers/net/tc35815.c
@@
-880,7
+880,7
@@
tc35815_open(struct net_device *dev)
*/
if (dev->irq == 0 ||
*/
if (dev->irq == 0 ||
- request_irq(dev->irq, &tc35815_interrupt,
SA_SHIRQ
, cardname, dev)) {
+ request_irq(dev->irq, &tc35815_interrupt,
IRQF_SHARED
, cardname, dev)) {
return -EAGAIN;
}
return -EAGAIN;
}
diff --git
a/drivers/net/tg3.c
b/drivers/net/tg3.c
index 953255e926339b5509176a9bf339b39dc0e3afd3..e5e1b296293612e0dfccfc8bf169c1883484e408 100644
(file)
--- a/
drivers/net/tg3.c
+++ b/
drivers/net/tg3.c
@@
-6702,12
+6702,12
@@
static int tg3_request_irq(struct tg3 *tp)
fn = tg3_msi;
if (tp->tg3_flags2 & TG3_FLG2_1SHOT_MSI)
fn = tg3_msi_1shot;
fn = tg3_msi;
if (tp->tg3_flags2 & TG3_FLG2_1SHOT_MSI)
fn = tg3_msi_1shot;
- flags =
SA
_SAMPLE_RANDOM;
+ flags =
IRQF
_SAMPLE_RANDOM;
} else {
fn = tg3_interrupt;
if (tp->tg3_flags & TG3_FLAG_TAGGED_STATUS)
fn = tg3_interrupt_tagged;
} else {
fn = tg3_interrupt;
if (tp->tg3_flags & TG3_FLAG_TAGGED_STATUS)
fn = tg3_interrupt_tagged;
- flags =
SA_SHIRQ | SA
_SAMPLE_RANDOM;
+ flags =
IRQF_SHARED | IRQF
_SAMPLE_RANDOM;
}
return (request_irq(tp->pdev->irq, fn, flags, dev->name, dev));
}
}
return (request_irq(tp->pdev->irq, fn, flags, dev->name, dev));
}
@@
-6726,7
+6726,7
@@
static int tg3_test_interrupt(struct tg3 *tp)
free_irq(tp->pdev->irq, dev);
err = request_irq(tp->pdev->irq, tg3_test_isr,
free_irq(tp->pdev->irq, dev);
err = request_irq(tp->pdev->irq, tg3_test_isr,
-
SA_SHIRQ | SA
_SAMPLE_RANDOM, dev->name, dev);
+
IRQF_SHARED | IRQF
_SAMPLE_RANDOM, dev->name, dev);
if (err)
return err;
if (err)
return err;
diff --git
a/drivers/net/tlan.c
b/drivers/net/tlan.c
index 12076f8f942c7d40017bfefbd016f3fe5f3dc710..23c0017f25a91e02f622bb5937a1128a4a952a57 100644
(file)
--- a/
drivers/net/tlan.c
+++ b/
drivers/net/tlan.c
@@
-943,7
+943,7
@@
static int TLan_Open( struct net_device *dev )
int err;
priv->tlanRev = TLan_DioRead8( dev->base_addr, TLAN_DEF_REVISION );
int err;
priv->tlanRev = TLan_DioRead8( dev->base_addr, TLAN_DEF_REVISION );
- err = request_irq( dev->irq, TLan_HandleInterrupt,
SA_SHIRQ
, TLanSignature, dev );
+ err = request_irq( dev->irq, TLan_HandleInterrupt,
IRQF_SHARED
, TLanSignature, dev );
if ( err ) {
printk(KERN_ERR "TLAN: Cannot open %s because IRQ %d is already in use.\n", dev->name, dev->irq );
if ( err ) {
printk(KERN_ERR "TLAN: Cannot open %s because IRQ %d is already in use.\n", dev->name, dev->irq );
diff --git
a/drivers/net/tokenring/3c359.c
b/drivers/net/tokenring/3c359.c
index 77bb298129d7caa057a18198457caaef1468d997..465921e3874c933e7e114c71c7d1179b25ffabc5 100644
(file)
--- a/
drivers/net/tokenring/3c359.c
+++ b/
drivers/net/tokenring/3c359.c
@@
-576,7
+576,7
@@
static int xl_open(struct net_device *dev)
u16 switchsettings, switchsettings_eeprom ;
u16 switchsettings, switchsettings_eeprom ;
- if(request_irq(dev->irq, &xl_interrupt,
SA_SHIRQ
, "3c359", dev)) {
+ if(request_irq(dev->irq, &xl_interrupt,
IRQF_SHARED
, "3c359", dev)) {
return -EAGAIN;
}
return -EAGAIN;
}
diff --git
a/drivers/net/tokenring/abyss.c
b/drivers/net/tokenring/abyss.c
index 649d8ea354f553688a6a7bb4373e0a6c5e5210ad..1bdd3beefbe54cf17121d1296e5d18dbfed3ac04 100644
(file)
--- a/
drivers/net/tokenring/abyss.c
+++ b/
drivers/net/tokenring/abyss.c
@@
-123,7
+123,7
@@
static int __devinit abyss_attach(struct pci_dev *pdev, const struct pci_device_
goto err_out_trdev;
}
goto err_out_trdev;
}
- ret = request_irq(pdev->irq, tms380tr_interrupt,
SA_SHIRQ
,
+ ret = request_irq(pdev->irq, tms380tr_interrupt,
IRQF_SHARED
,
dev->name, dev);
if (ret)
goto err_out_region;
dev->name, dev);
if (ret)
goto err_out_region;
diff --git
a/drivers/net/tokenring/lanstreamer.c
b/drivers/net/tokenring/lanstreamer.c
index 30dcdaebf41af52b2950467da70d519e5109a279..28d968ffd5d0ff37f6ed82fe67e0c23f40ee2844 100644
(file)
--- a/
drivers/net/tokenring/lanstreamer.c
+++ b/
drivers/net/tokenring/lanstreamer.c
@@
-601,7
+601,7
@@
static int streamer_open(struct net_device *dev)
rc=streamer_reset(dev);
}
rc=streamer_reset(dev);
}
- if (request_irq(dev->irq, &streamer_interrupt,
SA_SHIRQ
, "lanstreamer", dev)) {
+ if (request_irq(dev->irq, &streamer_interrupt,
IRQF_SHARED
, "lanstreamer", dev)) {
return -EAGAIN;
}
#if STREAMER_DEBUG
return -EAGAIN;
}
#if STREAMER_DEBUG
diff --git
a/drivers/net/tokenring/madgemc.c
b/drivers/net/tokenring/madgemc.c
index 19e6f4dfd69ce8478a86c200f060dd97d529efa5..666bbaaae82f5fe780f3d3d8571b26c9eaec6aa5 100644
(file)
--- a/
drivers/net/tokenring/madgemc.c
+++ b/
drivers/net/tokenring/madgemc.c
@@
-311,7
+311,7
@@
static int __devinit madgemc_probe(struct device *device)
*/
outb(0, dev->base_addr + MC_CONTROL_REG0); /* sanity */
madgemc_setsifsel(dev, 1);
*/
outb(0, dev->base_addr + MC_CONTROL_REG0); /* sanity */
madgemc_setsifsel(dev, 1);
- if (request_irq(dev->irq, madgemc_interrupt,
SA_SHIRQ
,
+ if (request_irq(dev->irq, madgemc_interrupt,
IRQF_SHARED
,
"madgemc", dev)) {
ret = -EBUSY;
goto getout3;
"madgemc", dev)) {
ret = -EBUSY;
goto getout3;
diff --git
a/drivers/net/tokenring/olympic.c
b/drivers/net/tokenring/olympic.c
index d7a30d99ae8fcaaad679e3aab0288f9e0a777d31..85831484bc40ce9914572d7d3525a103e2bb137b 100644
(file)
--- a/
drivers/net/tokenring/olympic.c
+++ b/
drivers/net/tokenring/olympic.c
@@
-445,7
+445,7
@@
static int olympic_open(struct net_device *dev)
olympic_init(dev);
olympic_init(dev);
- if(request_irq(dev->irq, &olympic_interrupt,
SA_SHIRQ
, "olympic", dev)) {
+ if(request_irq(dev->irq, &olympic_interrupt,
IRQF_SHARED
, "olympic", dev)) {
return -EAGAIN;
}
return -EAGAIN;
}
diff --git
a/drivers/net/tokenring/smctr.c
b/drivers/net/tokenring/smctr.c
index f2807ab5a2be17185f70b3770149d1c399def940..cd2e0251e2bc387c910622d2e0ee25e73690bc6d 100644
(file)
--- a/
drivers/net/tokenring/smctr.c
+++ b/
drivers/net/tokenring/smctr.c
@@
-531,7
+531,7
@@
static int __init smctr_chk_mca(struct net_device *dev)
dev->irq = 15;
break;
}
dev->irq = 15;
break;
}
- if (request_irq(dev->irq, smctr_interrupt,
SA_SHIRQ
, smctr_name, dev)) {
+ if (request_irq(dev->irq, smctr_interrupt,
IRQF_SHARED
, smctr_name, dev)) {
release_region(dev->base_addr, SMCTR_IO_EXTENT);
return -ENODEV;
}
release_region(dev->base_addr, SMCTR_IO_EXTENT);
return -ENODEV;
}
@@
-1061,7
+1061,7
@@
static int __init smctr_chk_isa(struct net_device *dev)
goto out2;
}
goto out2;
}
- if (request_irq(dev->irq, smctr_interrupt,
SA_SHIRQ
, smctr_name, dev))
+ if (request_irq(dev->irq, smctr_interrupt,
IRQF_SHARED
, smctr_name, dev))
goto out2;
/* Get 58x Rom Base */
goto out2;
/* Get 58x Rom Base */
diff --git
a/drivers/net/tokenring/tmspci.c
b/drivers/net/tokenring/tmspci.c
index ab47c0547a3ba0ada36f835a7a6a88d5b2ba39a4..7d3e270c4f4539888d9caf0162688eaeb643ea80 100644
(file)
--- a/
drivers/net/tokenring/tmspci.c
+++ b/
drivers/net/tokenring/tmspci.c
@@
-122,7
+122,7
@@
static int __devinit tms_pci_attach(struct pci_dev *pdev, const struct pci_devic
goto err_out_trdev;
}
goto err_out_trdev;
}
- ret = request_irq(pdev->irq, tms380tr_interrupt,
SA_SHIRQ
,
+ ret = request_irq(pdev->irq, tms380tr_interrupt,
IRQF_SHARED
,
dev->name, dev);
if (ret)
goto err_out_region;
dev->name, dev);
if (ret)
goto err_out_region;
diff --git
a/drivers/net/tulip/de2104x.c
b/drivers/net/tulip/de2104x.c
index 354294c6271e1513d9acae610797fe8de36d00e7..d05c5aa254eeb1163ffcc80c438a79072f20b22b 100644
(file)
--- 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);
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);
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 2647a5bc52113cc58960753ab09ca7a642bf686a..75ff14a552399937f052d4f970e8a5cb9cbd818f 100644
(file)
--- 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>
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.
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>
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
<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);
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);
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);
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 ba5b112093f4d6f28c9bb998749c12306c0e5be9..4e5b0f2acc395b2b407ca1a76d12564baac38151 100644
(file)
--- 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);
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;
if (ret)
return ret;
diff --git
a/drivers/net/tulip/tulip_core.c
b/drivers/net/tulip/tulip_core.c
index 8f4f4840fc12fb657f7424c3d762bad43a4582c8..7351831f57cec5f96c9687515c017a2e51d33b00 100644
(file)
--- 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;
{
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);
return retval;
tulip_init_ring (dev);
@@
-1770,7
+1770,7
@@
static int tulip_resume(struct pci_dev *pdev)
pci_enable_device(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;
}
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 8b3a28f53c3d0165d096287d4a983359413d8447..fd64b2b3e99c7d3949723b22a08ac677b0ab07fb 100644
(file)
--- 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);
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;
if (ret)
return ret;
diff --git
a/drivers/net/tulip/winbond-840.c
b/drivers/net/tulip/winbond-840.c
index 602a6e5002a076fcefb64a04742535c2012e8b4d..b4c0d101a7d72ac75fb55def0b141ac2e02cdaa0 100644
(file)
--- 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);
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;
if (i)
goto out_err;
diff --git
a/drivers/net/tulip/xircom_cb.c
b/drivers/net/tulip/xircom_cb.c
index 63c2175ed138bb89f496fdba3cb8b1092556771c..f874e4f6ccf6076d90899a3f73ba80c4fe4a58c2 100644
(file)
--- 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);
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;
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 aecafdabbc91a459db7d20a875ba559855ed0401..091ebb7a62f6013e12253e5b3855b7d3a4c6fd91 100644
(file)
--- 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);
{
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);
return -EAGAIN;
xircom_up(dev);
diff --git
a/drivers/net/typhoon.c
b/drivers/net/typhoon.c
index e24d2dafcf6c3695662c4ea3cdb8ece7cd672e38..063816f2b11ecf8de32f779c2dfb7ac3b192afdd 100644
(file)
--- a/
drivers/net/typhoon.c
+++ b/
drivers/net/typhoon.c
@@
-2131,7
+2131,7
@@
typhoon_open(struct net_device *dev)
goto out_sleep;
}
goto out_sleep;
}
- err = request_irq(dev->irq, &typhoon_interrupt,
SA_SHIRQ
,
+ err = request_irq(dev->irq, &typhoon_interrupt,
IRQF_SHARED
,
dev->name, dev);
if(err < 0)
goto out_sleep;
dev->name, dev);
if(err < 0)
goto out_sleep;
diff --git
a/drivers/net/via-rhine.c
b/drivers/net/via-rhine.c
index c80a4f1d5f7a958dc42e29856780925e2249a36e..98b6f3207d3da307c28a46825f3f8355885e589a 100644
(file)
--- a/
drivers/net/via-rhine.c
+++ b/
drivers/net/via-rhine.c
@@
-1210,7
+1210,7
@@
static int rhine_open(struct net_device *dev)
void __iomem *ioaddr = rp->base;
int rc;
void __iomem *ioaddr = rp->base;
int rc;
- rc = request_irq(rp->pdev->irq, &rhine_interrupt,
SA_SHIRQ
, dev->name,
+ rc = request_irq(rp->pdev->irq, &rhine_interrupt,
IRQF_SHARED
, dev->name,
dev);
if (rc)
return rc;
dev);
if (rc)
return rc;
@@
-1999,7
+1999,7
@@
static int rhine_resume(struct pci_dev *pdev)
if (!netif_running(dev))
return 0;
if (!netif_running(dev))
return 0;
- if (request_irq(dev->irq, rhine_interrupt,
SA_SHIRQ
, dev->name, dev))
+ if (request_irq(dev->irq, rhine_interrupt,
IRQF_SHARED
, dev->name, dev))
printk(KERN_ERR "via-rhine %s: request_irq failed\n", dev->name);
ret = pci_set_power_state(pdev, PCI_D0);
printk(KERN_ERR "via-rhine %s: request_irq failed\n", dev->name);
ret = pci_set_power_state(pdev, PCI_D0);
diff --git
a/drivers/net/via-velocity.c
b/drivers/net/via-velocity.c
index 857d71c3c017de3058b028b1fa9ed167db12d5dc..ba2972ba3757c30e5977bfdcb442450bfb1bde19 100644
(file)
--- a/
drivers/net/via-velocity.c
+++ b/
drivers/net/via-velocity.c
@@
-1750,7
+1750,7
@@
static int velocity_open(struct net_device *dev)
velocity_init_registers(vptr, VELOCITY_INIT_COLD);
velocity_init_registers(vptr, VELOCITY_INIT_COLD);
- ret = request_irq(vptr->pdev->irq, &velocity_intr,
SA_SHIRQ
,
+ ret = request_irq(vptr->pdev->irq, &velocity_intr,
IRQF_SHARED
,
dev->name, dev);
if (ret < 0) {
/* Power down the chip */
dev->name, dev);
if (ret < 0) {
/* Power down the chip */
diff --git
a/drivers/net/wan/dscc4.c
b/drivers/net/wan/dscc4.c
index 04a376ec0ed84ab737c373342914ed172a4b1129..684af4316ffdafee26c70342cc765b8bdb8dcaf1 100644
(file)
--- a/
drivers/net/wan/dscc4.c
+++ b/
drivers/net/wan/dscc4.c
@@
-752,7
+752,7
@@
static int __devinit dscc4_init_one(struct pci_dev *pdev,
priv = pci_get_drvdata(pdev);
priv = pci_get_drvdata(pdev);
- rc = request_irq(pdev->irq, dscc4_irq,
SA_SHIRQ
, DRV_NAME, priv->root);
+ rc = request_irq(pdev->irq, dscc4_irq,
IRQF_SHARED
, DRV_NAME, priv->root);
if (rc < 0) {
printk(KERN_WARNING "%s: IRQ %d busy\n", DRV_NAME, pdev->irq);
goto err_release_4;
if (rc < 0) {
printk(KERN_WARNING "%s: IRQ %d busy\n", DRV_NAME, pdev->irq);
goto err_release_4;
diff --git
a/drivers/net/wan/farsync.c
b/drivers/net/wan/farsync.c
index 7981a2c7906e0522aa3a34c4cd9ba7f6c84637fc..3705db04a343b54ab345edcc313b9dfa0856f093 100644
(file)
--- a/
drivers/net/wan/farsync.c
+++ b/
drivers/net/wan/farsync.c
@@
-2519,7
+2519,7
@@
fst_add_one(struct pci_dev *pdev, const struct pci_device_id *ent)
dbg(DBG_PCI, "kernel mem %p, ctlmem %p\n", card->mem, card->ctlmem);
/* Register the interrupt handler */
dbg(DBG_PCI, "kernel mem %p, ctlmem %p\n", card->mem, card->ctlmem);
/* Register the interrupt handler */
- if (request_irq(pdev->irq, fst_intr,
SA_SHIRQ
, FST_DEV_NAME, card)) {
+ if (request_irq(pdev->irq, fst_intr,
IRQF_SHARED
, FST_DEV_NAME, card)) {
printk_err("Unable to register interrupt %d\n", card->irq);
pci_release_regions(pdev);
pci_disable_device(pdev);
printk_err("Unable to register interrupt %d\n", card->irq);
pci_release_regions(pdev);
pci_disable_device(pdev);
diff --git
a/drivers/net/wan/hostess_sv11.c
b/drivers/net/wan/hostess_sv11.c
index cf5c805452a39ec0474dd8268694b5719b341aca..a4f735723c4100ad2a7df897f8868f4e1a4b2b93 100644
(file)
--- a/
drivers/net/wan/hostess_sv11.c
+++ b/
drivers/net/wan/hostess_sv11.c
@@
-264,7
+264,7
@@
static struct sv11_device *sv11_init(int iobase, int irq)
/* We want a fast IRQ for this device. Actually we'd like an even faster
IRQ ;) - This is one driver RtLinux is made for */
/* We want a fast IRQ for this device. Actually we'd like an even faster
IRQ ;) - This is one driver RtLinux is made for */
- if(request_irq(irq, &z8530_interrupt,
SA_INTERRUPT
, "Hostess SV11", dev)<0)
+ if(request_irq(irq, &z8530_interrupt,
IRQF_DISABLED
, "Hostess SV11", dev)<0)
{
printk(KERN_WARNING "hostess: IRQ %d already in use.\n", irq);
goto fail1;
{
printk(KERN_WARNING "hostess: IRQ %d already in use.\n", irq);
goto fail1;
diff --git
a/drivers/net/wan/lmc/lmc_main.c
b/drivers/net/wan/lmc/lmc_main.c
index 40926d779161d10602090f5314392625c68af622..39f44241a72854781691f33e619785994486bf11 100644
(file)
--- a/
drivers/net/wan/lmc/lmc_main.c
+++ b/
drivers/net/wan/lmc/lmc_main.c
@@
-1058,7
+1058,7
@@
static int lmc_open (struct net_device *dev) /*fold00*/
lmc_softreset (sc);
/* Since we have to use PCI bus, this should work on x86,alpha,ppc */
lmc_softreset (sc);
/* Since we have to use PCI bus, this should work on x86,alpha,ppc */
- if (request_irq (dev->irq, &lmc_interrupt,
SA_SHIRQ
, dev->name, dev)){
+ if (request_irq (dev->irq, &lmc_interrupt,
IRQF_SHARED
, dev->name, dev)){
printk(KERN_WARNING "%s: could not get irq: %d\n", dev->name, dev->irq);
lmc_trace(dev, "lmc_open irq failed out");
return -EAGAIN;
printk(KERN_WARNING "%s: could not get irq: %d\n", dev->name, dev->irq);
lmc_trace(dev, "lmc_open irq failed out");
return -EAGAIN;
diff --git
a/drivers/net/wan/pc300_drv.c
b/drivers/net/wan/pc300_drv.c
index d7897ae89f904dc906250c67cdde073f2243e7ed..567effff4a3e2b86849daae5c155bab5a42c10d0 100644
(file)
--- a/
drivers/net/wan/pc300_drv.c
+++ b/
drivers/net/wan/pc300_drv.c
@@
-3600,7
+3600,7
@@
cpc_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
}
/* Allocate IRQ */
}
/* Allocate IRQ */
- if (request_irq(card->hw.irq, cpc_intr,
SA_SHIRQ
, "Cyclades-PC300", card)) {
+ if (request_irq(card->hw.irq, cpc_intr,
IRQF_SHARED
, "Cyclades-PC300", card)) {
printk ("PC300 found at RAM 0x%08x, but could not allocate IRQ%d.\n",
card->hw.ramphys, card->hw.irq);
goto err_io_unmap;
printk ("PC300 found at RAM 0x%08x, but could not allocate IRQ%d.\n",
card->hw.ramphys, card->hw.irq);
goto err_io_unmap;
diff --git
a/drivers/net/wan/pci200syn.c
b/drivers/net/wan/pci200syn.c
index 24c3c57c13c933d90f50933d1540791425d61f13..4df61fa3214b52415a3972604a1df73a5d3bd463 100644
(file)
--- a/
drivers/net/wan/pci200syn.c
+++ b/
drivers/net/wan/pci200syn.c
@@
-402,7
+402,7
@@
static int __devinit pci200_pci_init_one(struct pci_dev *pdev,
writew(readw(p) | 0x0040, p);
/* Allocate IRQ */
writew(readw(p) | 0x0040, p);
/* Allocate IRQ */
- if (request_irq(pdev->irq, sca_intr,
SA_SHIRQ
, devname, card)) {
+ if (request_irq(pdev->irq, sca_intr,
IRQF_SHARED
, devname, card)) {
printk(KERN_WARNING "pci200syn: could not allocate IRQ%d.\n",
pdev->irq);
pci200_pci_remove_one(pdev);
printk(KERN_WARNING "pci200syn: could not allocate IRQ%d.\n",
pdev->irq);
pci200_pci_remove_one(pdev);
diff --git
a/drivers/net/wan/sbni.c
b/drivers/net/wan/sbni.c
index f2d071272ceed554304d13801f635671024d62c2..fc75bec19029d6372c65a48d0a9cda92cb1a15bb 100644
(file)
--- a/
drivers/net/wan/sbni.c
+++ b/
drivers/net/wan/sbni.c
@@
-1192,7
+1192,7
@@
sbni_open( struct net_device *dev )
}
}
}
}
- if( request_irq(dev->irq, sbni_interrupt,
SA_SHIRQ
, dev->name, dev) ) {
+ if( request_irq(dev->irq, sbni_interrupt,
IRQF_SHARED
, dev->name, dev) ) {
printk( KERN_ERR "%s: unable to get IRQ %d.\n",
dev->name, dev->irq );
return -EAGAIN;
printk( KERN_ERR "%s: unable to get IRQ %d.\n",
dev->name, dev->irq );
return -EAGAIN;
diff --git
a/drivers/net/wan/sealevel.c
b/drivers/net/wan/sealevel.c
index 050e854e77749a7b5d77c7afb34c927e13aa7f5a..70fb1b98b1ddd271950ba08760f24f6da0e08ec4 100644
(file)
--- a/
drivers/net/wan/sealevel.c
+++ b/
drivers/net/wan/sealevel.c
@@
-322,7
+322,7
@@
static __init struct slvl_board *slvl_init(int iobase, int irq,
/* We want a fast IRQ for this device. Actually we'd like an even faster
IRQ ;) - This is one driver RtLinux is made for */
/* We want a fast IRQ for this device. Actually we'd like an even faster
IRQ ;) - This is one driver RtLinux is made for */
- if(request_irq(irq, &z8530_interrupt,
SA_INTERRUPT
, "SeaLevel", dev)<0)
+ if(request_irq(irq, &z8530_interrupt,
IRQF_DISABLED
, "SeaLevel", dev)<0)
{
printk(KERN_WARNING "sealevel: IRQ %d already in use.\n", irq);
goto fail1_1;
{
printk(KERN_WARNING "sealevel: IRQ %d already in use.\n", irq);
goto fail1_1;
diff --git
a/drivers/net/wan/wanxl.c
b/drivers/net/wan/wanxl.c
index 437e0e938e38ba7c0239d4a7e9c6b732faa742fc..d564224cdca90494046fda6e51a95a9f6c99e25c 100644
(file)
--- a/
drivers/net/wan/wanxl.c
+++ b/
drivers/net/wan/wanxl.c
@@
-755,7
+755,7
@@
static int __devinit wanxl_pci_init_one(struct pci_dev *pdev,
pci_name(pdev), plx_phy, ramsize / 1024, mem_phy, pdev->irq);
/* Allocate IRQ */
pci_name(pdev), plx_phy, ramsize / 1024, mem_phy, pdev->irq);
/* Allocate IRQ */
- if (request_irq(pdev->irq, wanxl_intr,
SA_SHIRQ
, "wanXL", card)) {
+ if (request_irq(pdev->irq, wanxl_intr,
IRQF_SHARED
, "wanXL", card)) {
printk(KERN_WARNING "wanXL %s: could not allocate IRQ%i.\n",
pci_name(pdev), pdev->irq);
wanxl_pci_remove_one(pdev);
printk(KERN_WARNING "wanXL %s: could not allocate IRQ%i.\n",
pci_name(pdev), pdev->irq);
wanxl_pci_remove_one(pdev);
diff --git
a/drivers/net/wireless/airo.c
b/drivers/net/wireless/airo.c
index 89328d119efa5662e37551d18a09a664757d2f64..a4dd1394271446192ccf51a26a82d70c4d0bf042 100644
(file)
--- a/
drivers/net/wireless/airo.c
+++ b/
drivers/net/wireless/airo.c
@@
-2848,7
+2848,7
@@
static struct net_device *_init_airo_card( unsigned short irq, int port,
reset_card (dev, 1);
msleep(400);
reset_card (dev, 1);
msleep(400);
- rc = request_irq( dev->irq, airo_interrupt,
SA_SHIRQ
, dev->name, dev );
+ rc = request_irq( dev->irq, airo_interrupt,
IRQF_SHARED
, dev->name, dev );
if (rc) {
airo_print_err(dev->name, "register interrupt %d failed, rc %d",
irq, rc);
if (rc) {
airo_print_err(dev->name, "register interrupt %d failed, rc %d",
irq, rc);
diff --git
a/drivers/net/wireless/atmel.c
b/drivers/net/wireless/atmel.c
index 54e31fa2d402be390e2fc536fe7892aeba8ac785..995c7bea5897e9727ad66275eafd048658ec570f 100644
(file)
--- a/
drivers/net/wireless/atmel.c
+++ b/
drivers/net/wireless/atmel.c
@@
-1577,7
+1577,7
@@
struct net_device *init_atmel_card(unsigned short irq, unsigned long port,
SET_NETDEV_DEV(dev, sys_dev);
SET_NETDEV_DEV(dev, sys_dev);
- if ((rc = request_irq(dev->irq, service_interrupt,
SA_SHIRQ
, dev->name, dev))) {
+ if ((rc = request_irq(dev->irq, service_interrupt,
IRQF_SHARED
, dev->name, dev))) {
printk(KERN_ERR "%s: register interrupt %d failed, rc %d\n", dev->name, irq, rc);
goto err_out_free;
}
printk(KERN_ERR "%s: register interrupt %d failed, rc %d\n", dev->name, irq, rc);
goto err_out_free;
}
diff --git
a/drivers/net/wireless/bcm43xx/bcm43xx_main.c
b/drivers/net/wireless/bcm43xx/bcm43xx_main.c
index 27bcf47228e23c3cc03957703fccc2129d3f9251..d8f5600578b492fb6da90840c3a4ec3e71bc3c32 100644
(file)
--- a/
drivers/net/wireless/bcm43xx/bcm43xx_main.c
+++ b/
drivers/net/wireless/bcm43xx/bcm43xx_main.c
@@
-2175,7
+2175,7
@@
static int bcm43xx_initialize_irq(struct bcm43xx_private *bcm)
}
#endif
res = request_irq(bcm->irq, bcm43xx_interrupt_handler,
}
#endif
res = request_irq(bcm->irq, bcm43xx_interrupt_handler,
-
SA_SHIRQ
, KBUILD_MODNAME, bcm);
+
IRQF_SHARED
, KBUILD_MODNAME, bcm);
if (res) {
printk(KERN_ERR PFX "Cannot register IRQ%d\n", bcm->irq);
return -ENODEV;
if (res) {
printk(KERN_ERR PFX "Cannot register IRQ%d\n", bcm->irq);
return -ENODEV;
diff --git
a/drivers/net/wireless/hostap/hostap_pci.c
b/drivers/net/wireless/hostap/hostap_pci.c
index 5ea8ac835857821e5f5e16729caff0db3cfb7ec4..c2fa011be291d90c32f1e6d9a4ec70ba3f951847 100644
(file)
--- a/
drivers/net/wireless/hostap/hostap_pci.c
+++ b/
drivers/net/wireless/hostap/hostap_pci.c
@@
-337,7
+337,7
@@
static int prism2_pci_probe(struct pci_dev *pdev,
pci_set_drvdata(pdev, dev);
pci_set_drvdata(pdev, dev);
- if (request_irq(dev->irq, prism2_interrupt,
SA_SHIRQ
, dev->name,
+ if (request_irq(dev->irq, prism2_interrupt,
IRQF_SHARED
, dev->name,
dev)) {
printk(KERN_WARNING "%s: request_irq failed\n", dev->name);
goto fail;
dev)) {
printk(KERN_WARNING "%s: request_irq failed\n", dev->name);
goto fail;
diff --git
a/drivers/net/wireless/hostap/hostap_plx.c
b/drivers/net/wireless/hostap/hostap_plx.c
index 4ee6abbc65ecfe4108c88b7abec4a34723ad441b..49860fa61c307f0cea50df9e031ca485d10222e7 100644
(file)
--- a/
drivers/net/wireless/hostap/hostap_plx.c
+++ b/
drivers/net/wireless/hostap/hostap_plx.c
@@
-550,7
+550,7
@@
static int prism2_plx_probe(struct pci_dev *pdev,
pci_set_drvdata(pdev, dev);
pci_set_drvdata(pdev, dev);
- if (request_irq(dev->irq, prism2_interrupt,
SA_SHIRQ
, dev->name,
+ if (request_irq(dev->irq, prism2_interrupt,
IRQF_SHARED
, dev->name,
dev)) {
printk(KERN_WARNING "%s: request_irq failed\n", dev->name);
goto fail;
dev)) {
printk(KERN_WARNING "%s: request_irq failed\n", dev->name);
goto fail;
diff --git
a/drivers/net/wireless/ipw2100.c
b/drivers/net/wireless/ipw2100.c
index 27f744e43095d3c199b9a2097edcaf53244c1711..e955db435b30b4ef9e2c87106790ada253582fa6 100644
(file)
--- a/
drivers/net/wireless/ipw2100.c
+++ b/
drivers/net/wireless/ipw2100.c
@@
-6229,7
+6229,7
@@
static int ipw2100_pci_init_one(struct pci_dev *pci_dev,
ipw2100_queues_initialize(priv);
err = request_irq(pci_dev->irq,
ipw2100_queues_initialize(priv);
err = request_irq(pci_dev->irq,
- ipw2100_interrupt,
SA_SHIRQ
, dev->name, priv);
+ ipw2100_interrupt,
IRQF_SHARED
, dev->name, priv);
if (err) {
printk(KERN_WARNING DRV_NAME
"Error calling request_irq: %d.\n", pci_dev->irq);
if (err) {
printk(KERN_WARNING DRV_NAME
"Error calling request_irq: %d.\n", pci_dev->irq);
diff --git
a/drivers/net/wireless/ipw2200.c
b/drivers/net/wireless/ipw2200.c
index a8a8f975432fe1e32a3fb04aa0a4bc2d59d94e24..b3300ffe4eecb8dc888091255d4fbda501ce7efc 100644
(file)
--- a/
drivers/net/wireless/ipw2200.c
+++ b/
drivers/net/wireless/ipw2200.c
@@
-11545,7
+11545,7
@@
static int ipw_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
ipw_sw_reset(priv, 1);
ipw_sw_reset(priv, 1);
- err = request_irq(pdev->irq, ipw_isr,
SA_SHIRQ
, DRV_NAME, priv);
+ err = request_irq(pdev->irq, ipw_isr,
IRQF_SHARED
, DRV_NAME, priv);
if (err) {
IPW_ERROR("Error allocating IRQ %d\n", pdev->irq);
goto out_destroy_workqueue;
if (err) {
IPW_ERROR("Error allocating IRQ %d\n", pdev->irq);
goto out_destroy_workqueue;
diff --git
a/drivers/net/wireless/orinoco_nortel.c
b/drivers/net/wireless/orinoco_nortel.c
index 4597fe1d19797a5ee3adb9deebcf0601ef65b367..bf05b907747eaae6e1f7ce03ec12584b465371e9 100644
(file)
--- a/
drivers/net/wireless/orinoco_nortel.c
+++ b/
drivers/net/wireless/orinoco_nortel.c
@@
-198,7
+198,7
@@
static int orinoco_nortel_init_one(struct pci_dev *pdev,
hermes_struct_init(&priv->hw, hermes_io, HERMES_16BIT_REGSPACING);
hermes_struct_init(&priv->hw, hermes_io, HERMES_16BIT_REGSPACING);
- err = request_irq(pdev->irq, orinoco_interrupt,
SA_SHIRQ
,
+ err = request_irq(pdev->irq, orinoco_interrupt,
IRQF_SHARED
,
dev->name, dev);
if (err) {
printk(KERN_ERR PFX "Cannot allocate IRQ %d\n", pdev->irq);
dev->name, dev);
if (err) {
printk(KERN_ERR PFX "Cannot allocate IRQ %d\n", pdev->irq);
diff --git
a/drivers/net/wireless/orinoco_pci.c
b/drivers/net/wireless/orinoco_pci.c
index de3eae082a0dd4ebb4ef7f91763b792cda4bb5f2..1759c543fbee9bc6da6ed8bc2572cd765edc12e5 100644
(file)
--- a/
drivers/net/wireless/orinoco_pci.c
+++ b/
drivers/net/wireless/orinoco_pci.c
@@
-153,7
+153,7
@@
static int orinoco_pci_init_one(struct pci_dev *pdev,
hermes_struct_init(&priv->hw, hermes_io, HERMES_32BIT_REGSPACING);
hermes_struct_init(&priv->hw, hermes_io, HERMES_32BIT_REGSPACING);
- err = request_irq(pdev->irq, orinoco_interrupt,
SA_SHIRQ
,
+ err = request_irq(pdev->irq, orinoco_interrupt,
IRQF_SHARED
,
dev->name, dev);
if (err) {
printk(KERN_ERR PFX "Cannot allocate IRQ %d\n", pdev->irq);
dev->name, dev);
if (err) {
printk(KERN_ERR PFX "Cannot allocate IRQ %d\n", pdev->irq);
diff --git
a/drivers/net/wireless/orinoco_pci.h
b/drivers/net/wireless/orinoco_pci.h
index 7eb1e08113e0886fa1b9e3ddfc9d0e529991ecb1..be1abea4b64f69ff9a28992622b866c838a32af4 100644
(file)
--- a/
drivers/net/wireless/orinoco_pci.h
+++ b/
drivers/net/wireless/orinoco_pci.h
@@
-63,7
+63,7
@@
static int orinoco_pci_resume(struct pci_dev *pdev)
pci_enable_device(pdev);
pci_restore_state(pdev);
pci_enable_device(pdev);
pci_restore_state(pdev);
- err = request_irq(pdev->irq, orinoco_interrupt,
SA_SHIRQ
,
+ err = request_irq(pdev->irq, orinoco_interrupt,
IRQF_SHARED
,
dev->name, dev);
if (err) {
printk(KERN_ERR "%s: cannot re-allocate IRQ on resume\n",
dev->name, dev);
if (err) {
printk(KERN_ERR "%s: cannot re-allocate IRQ on resume\n",
diff --git
a/drivers/net/wireless/orinoco_plx.c
b/drivers/net/wireless/orinoco_plx.c
index 3f928b8939f03c15758928c9d7aa0466e3cc1102..7f006f6241711d0d6ad52e013d976e7284219b70 100644
(file)
--- a/
drivers/net/wireless/orinoco_plx.c
+++ b/
drivers/net/wireless/orinoco_plx.c
@@
-237,7
+237,7
@@
static int orinoco_plx_init_one(struct pci_dev *pdev,
hermes_struct_init(&priv->hw, hermes_io, HERMES_16BIT_REGSPACING);
hermes_struct_init(&priv->hw, hermes_io, HERMES_16BIT_REGSPACING);
- err = request_irq(pdev->irq, orinoco_interrupt,
SA_SHIRQ
,
+ err = request_irq(pdev->irq, orinoco_interrupt,
IRQF_SHARED
,
dev->name, dev);
if (err) {
printk(KERN_ERR PFX "Cannot allocate IRQ %d\n", pdev->irq);
dev->name, dev);
if (err) {
printk(KERN_ERR PFX "Cannot allocate IRQ %d\n", pdev->irq);
diff --git
a/drivers/net/wireless/orinoco_tmd.c
b/drivers/net/wireless/orinoco_tmd.c
index 160a642185f0fb92ec44717a0c349e6bd4f2ef05..0831721e4d6ccf38e5e5052190cd09d41e4df8d7 100644
(file)
--- a/
drivers/net/wireless/orinoco_tmd.c
+++ b/
drivers/net/wireless/orinoco_tmd.c
@@
-139,7
+139,7
@@
static int orinoco_tmd_init_one(struct pci_dev *pdev,
hermes_struct_init(&priv->hw, hermes_io, HERMES_16BIT_REGSPACING);
hermes_struct_init(&priv->hw, hermes_io, HERMES_16BIT_REGSPACING);
- err = request_irq(pdev->irq, orinoco_interrupt,
SA_SHIRQ
,
+ err = request_irq(pdev->irq, orinoco_interrupt,
IRQF_SHARED
,
dev->name, dev);
if (err) {
printk(KERN_ERR PFX "Cannot allocate IRQ %d\n", pdev->irq);
dev->name, dev);
if (err) {
printk(KERN_ERR PFX "Cannot allocate IRQ %d\n", pdev->irq);
diff --git
a/drivers/net/wireless/prism54/islpci_hotplug.c
b/drivers/net/wireless/prism54/islpci_hotplug.c
index bfa0cc319a098717ed6f7712e2ed35ccabed07eb..09fc17a0f02972494f96b28bfb34928f6e6ca49c 100644
(file)
--- a/
drivers/net/wireless/prism54/islpci_hotplug.c
+++ b/
drivers/net/wireless/prism54/islpci_hotplug.c
@@
-189,7
+189,7
@@
prism54_probe(struct pci_dev *pdev, const struct pci_device_id *id)
/* request for the interrupt before uploading the firmware */
rvalue = request_irq(pdev->irq, &islpci_interrupt,
/* request for the interrupt before uploading the firmware */
rvalue = request_irq(pdev->irq, &islpci_interrupt,
-
SA_SHIRQ
, ndev->name, priv);
+
IRQF_SHARED
, ndev->name, priv);
if (rvalue) {
/* error, could not hook the handler to the irq */
if (rvalue) {
/* error, could not hook the handler to the irq */
diff --git
a/drivers/net/yellowfin.c
b/drivers/net/yellowfin.c
index 569305f57561fd5304a3ae73b490f78edebfe380..bbbf7e274a2a98f756785effdcac44e66d231663 100644
(file)
--- a/
drivers/net/yellowfin.c
+++ b/
drivers/net/yellowfin.c
@@
-602,7
+602,7
@@
static int yellowfin_open(struct net_device *dev)
/* Reset the chip. */
iowrite32(0x80000000, ioaddr + DMACtrl);
/* Reset the chip. */
iowrite32(0x80000000, ioaddr + DMACtrl);
- i = request_irq(dev->irq, &yellowfin_interrupt,
SA_SHIRQ
, dev->name, dev);
+ i = request_irq(dev->irq, &yellowfin_interrupt,
IRQF_SHARED
, dev->name, dev);
if (i) return i;
if (yellowfin_debug > 1)
if (i) return i;
if (yellowfin_debug > 1)
diff --git
a/drivers/net/zorro8390.c
b/drivers/net/zorro8390.c
index 8037e5806d0a48b33a28815cdd828cb90cfe77eb..df04e050c647184df6c76852a11cc13058c9719a 100644
(file)
--- a/
drivers/net/zorro8390.c
+++ b/
drivers/net/zorro8390.c
@@
-201,7
+201,7
@@
static int __devinit zorro8390_init(struct net_device *dev,
dev->irq = IRQ_AMIGA_PORTS;
/* Install the Interrupt handler */
dev->irq = IRQ_AMIGA_PORTS;
/* Install the Interrupt handler */
- i = request_irq(IRQ_AMIGA_PORTS, ei_interrupt,
SA_SHIRQ
, DRV_NAME, dev);
+ i = request_irq(IRQ_AMIGA_PORTS, ei_interrupt,
IRQF_SHARED
, DRV_NAME, dev);
if (i) return i;
for(i = 0; i < ETHER_ADDR_LEN; i++) {
if (i) return i;
for(i = 0; i < ETHER_ADDR_LEN; i++) {
diff --git
a/include/net/irda/irda_device.h
b/include/net/irda/irda_device.h
index 0575c59a5c96b203c3d93c4cf0e5027ede827327..bca19ca7bdd47418b7d93d7aca538479951047d9 100644
(file)
--- a/
include/net/irda/irda_device.h
+++ b/
include/net/irda/irda_device.h
@@
-160,7
+160,7
@@
typedef struct {
int irq, irq2; /* Interrupts used */
int dma, dma2; /* DMA channel(s) used */
int fifo_size; /* FIFO size */
int irq, irq2; /* Interrupts used */
int dma, dma2; /* DMA channel(s) used */
int fifo_size; /* FIFO size */
- int irqflags; /* interrupt flags (ie,
SA_SHIRQ|SA_INTERRUPT
) */
+ int irqflags; /* interrupt flags (ie,
IRQF_SHARED|IRQF_DISABLED
) */
int direction; /* Link direction, used by some FIR drivers */
int enabled; /* Powered on? */
int suspended; /* Suspended by APM */
int direction; /* Link direction, used by some FIR drivers */
int enabled; /* Powered on? */
int suspended; /* Suspended by APM */