leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH] irq-flags: drivers/net: Use the new IRQF_ constants

Browse Source 
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>
This commit is contained in:
Thomas Gleixner 2006-07-01 19:29:39 -07:00 committed by Linus Torvalds
parent dace145374
commit 1fb9df5d30
128 changed files with 159 additions and 159 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/3c515.c
View File

@ -760,7 +760,7 @@ static int corkscrew_open(struct net_device *dev)
vp->product_name, dev)) return -EAGAIN; vp->product_name, dev)) return -EAGAIN;
enable_dma(dev->dma); enable_dma(dev->dma);
set_dma_mode(dev->dma, DMA_MODE_CASCADE); 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)) { vp->product_name, dev)) {
return -EAGAIN; return -EAGAIN;
} }

2
drivers/net/3c523.c
View File

@ -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); dev->name, dev);
if (ret) { if (ret) {
printk(KERN_ERR "%s: couldn't get irq %d\n", dev->name, dev->irq); printk(KERN_ERR "%s: couldn't get irq %d\n", dev->name, dev->irq);

2
drivers/net/3c527.c
View File

@ -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) { if (err) {
release_region(dev->base_addr, MC32_IO_EXTENT); release_region(dev->base_addr, MC32_IO_EXTENT);
printk(KERN_ERR "%s: unable to get IRQ %d.\n", DRV_NAME, dev->irq); printk(KERN_ERR "%s: unable to get IRQ %d.\n", DRV_NAME, dev->irq);

4
drivers/net/3c59x.c
View File

@ -996,7 +996,7 @@ static int vortex_resume(struct pci_dev *pdev)
pci_enable_device(pdev); pci_enable_device(pdev);
pci_set_master(pdev); pci_set_master(pdev);
if (request_irq(dev->irq, vp->full_bus_master_rx ? 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); printk(KERN_WARNING "%s: Could not reserve IRQ %d\n", dev->name, dev->irq);
pci_disable_device(pdev); pci_disable_device(pdev);
return -EBUSY; return -EBUSY;
@ -1833,7 +1833,7 @@ vortex_open(struct net_device *dev)
/* Use the now-standard shared IRQ implementation. */ /* Use the now-standard shared IRQ implementation. */
if ((retval = request_irq(dev->irq, vp->full_bus_master_rx ? 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); printk(KERN_ERR "%s: Could not reserve IRQ %d\n", dev->name, dev->irq);
goto out; goto out;
} }

2
drivers/net/8139cp.c
View File

@ -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) if (rc)
goto err_out_hw; goto err_out_hw;

2
drivers/net/8139too.c
View File

@ -1310,7 +1310,7 @@ static int rtl8139_open (struct net_device *dev)
int retval; int retval;
void __iomem *ioaddr = tp->mmio_addr; 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) if (retval)
return retval; return retval;

2
drivers/net/a2065.c
View File

@ -495,7 +495,7 @@ static int lance_open (struct net_device *dev)
ll->rdp = LE_C0_STOP; ll->rdp = LE_C0_STOP;
/* Install the Interrupt handler */ /* 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); dev->name, dev);
if (ret) return ret; if (ret) return ret;

2
drivers/net/acenic.c
View File

@ -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); DRV_NAME, dev);
if (ecode) { if (ecode) {
printk(KERN_WARNING "%s: Requested IRQ %d is busy\n", printk(KERN_WARNING "%s: Requested IRQ %d is busy\n",

2
drivers/net/amd8111e.c
View File

@ -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)) dev->name, dev))
return -EAGAIN; return -EAGAIN;

2
drivers/net/apne.c
View File

@ -313,7 +313,7 @@ static int __init apne_probe1(struct net_device *dev, int ioaddr)
dev->base_addr = ioaddr; dev->base_addr = ioaddr;
/* Install the Interrupt handler */ /* 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; if (i) return i;
for(i = 0; i < ETHER_ADDR_LEN; i++) { for(i = 0; i < ETHER_ADDR_LEN; i++) {

2
drivers/net/arcnet/com20020-pci.c
View File

@ -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; goto out_port;
return 0; return 0;

2
drivers/net/ariadne.c
View File

@ -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); dev->name, dev);
if (i) return i; if (i) return i;

4
drivers/net/b44.c
View File

@ -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)) { if (unlikely(err < 0)) {
b44_chip_reset(bp); b44_chip_reset(bp);
b44_free_rings(bp); b44_free_rings(bp);
@ -2322,7 +2322,7 @@ static int b44_resume(struct pci_dev *pdev)
if (!netif_running(dev)) if (!netif_running(dev))
return 0; 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); printk(KERN_ERR PFX "%s: request_irq failed\n", dev->name);
spin_lock_irq(&bp->lock); spin_lock_irq(&bp->lock);

6
drivers/net/bnx2.c
View File

@ -4260,11 +4260,11 @@ bnx2_open(struct net_device *dev)
} }
else { else {
rc = request_irq(bp->pdev->irq, bnx2_interrupt, 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); dev->name, dev);
} }
if (rc) { if (rc) {
@ -4311,7 +4311,7 @@ bnx2_open(struct net_device *dev)
if (!rc) { if (!rc) {
rc = request_irq(bp->pdev->irq, bnx2_interrupt, rc = request_irq(bp->pdev->irq, bnx2_interrupt,
SA_SHIRQ, dev->name, dev); IRQF_SHARED, dev->name, dev);
} }
if (rc) { if (rc) {
bnx2_free_skbs(bp); bnx2_free_skbs(bp);

2
drivers/net/cassini.c
View File

@ -4349,7 +4349,7 @@ static int cas_open(struct net_device *dev)
* mapping to expose them * mapping to expose them
*/ */
if (request_irq(cp->pdev->irq, cas_interrupt, 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", printk(KERN_ERR "%s: failed to request irq !\n",
cp->dev->name); cp->dev->name);
err = -EAGAIN; err = -EAGAIN;

2
drivers/net/chelsio/cxgb2.c
View File

@ -218,7 +218,7 @@ static int cxgb_up(struct adapter *adapter)
t1_interrupts_clear(adapter); t1_interrupts_clear(adapter);
if ((err = request_irq(adapter->pdev->irq, if ((err = request_irq(adapter->pdev->irq,
t1_select_intr_handler(adapter), SA_SHIRQ, t1_select_intr_handler(adapter), IRQF_SHARED,
adapter->name, adapter))) { adapter->name, adapter))) {
goto out_err; goto out_err;
} }

2
drivers/net/cris/eth_v10.c
View File

@ -671,7 +671,7 @@ e100_open(struct net_device *dev)
/* allocate the irq corresponding to the receiving DMA */ /* allocate the irq corresponding to the receiving DMA */
if (request_irq(NETWORK_DMA_RX_IRQ_NBR, e100rxtx_interrupt, 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;
} }

2
drivers/net/defxx.c
View File

@ -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) { if (ret) {
printk(KERN_ERR "%s: Requested IRQ %d is busy\n", dev->name, dev->irq); printk(KERN_ERR "%s: Requested IRQ %d is busy\n", dev->name, dev->irq);
return ret; return ret;

2
drivers/net/dgrs.c
View File

@ -1191,7 +1191,7 @@ dgrs_probe1(struct net_device *dev)
if (priv->plxreg) if (priv->plxreg)
OUTL(dev->base_addr + PLX_LCL2PCI_DOORBELL, 1); 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) if (rc)
goto err_out; goto err_out;

2
drivers/net/dl2k.c
View File

@ -440,7 +440,7 @@ rio_open (struct net_device *dev)
int i; int i;
u16 macctrl; 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) if (i)
return i; return i;

2
drivers/net/dm9000.c
View File

@ -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; return -EAGAIN;
/* Initialize DM9000 board */ /* Initialize DM9000 board */

2
drivers/net/e100.c
View File

@ -2063,7 +2063,7 @@ static int e100_up(struct nic *nic)
e100_set_multicast_list(nic->netdev); e100_set_multicast_list(nic->netdev);
e100_start_receiver(nic, NULL); e100_start_receiver(nic, NULL);
mod_timer(&nic->watchdog, jiffies); 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))) nic->netdev->name, nic->netdev)))
goto err_no_irq; goto err_no_irq;
netif_wake_queue(nic->netdev); netif_wake_queue(nic->netdev);

6
drivers/net/e1000/e1000_ethtool.c
View File

@ -871,10 +871,10 @@ e1000_intr_test(struct e1000_adapter *adapter, uint64_t *data)
*data = 0; *data = 0;
/* Hook up test interrupt handler just for this test */ /* Hook up test interrupt handler just for this test */
if (!request_irq(irq, &e1000_test_intr, SA_PROBEIRQ, netdev->name, if (!request_irq(irq, &e1000_test_intr, IRQF_PROBE_SHARED,
netdev)) { 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)){ netdev->name, netdev)){
*data = 1; *data = 1;
return -1; return -1;

2
drivers/net/e1000/e1000_main.c
View File

@ -426,7 +426,7 @@ e1000_up(struct e1000_adapter *adapter)
} }
#endif #endif
if ((err = request_irq(adapter->pdev->irq, &e1000_intr, if ((err = request_irq(adapter->pdev->irq, &e1000_intr,
SA_SHIRQ | SA_SAMPLE_RANDOM, IRQF_SHARED | IRQF_SAMPLE_RANDOM,
netdev->name, netdev))) { netdev->name, netdev))) {
DPRINTK(PROBE, ERR, DPRINTK(PROBE, ERR,
"Unable to allocate interrupt Error: %d\n", err); "Unable to allocate interrupt Error: %d\n", err);

2
drivers/net/eepro.c
View File

@ -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; unsigned long irq_mask;
/* Twinkle the interrupt, and check if it's seen */ /* Twinkle the interrupt, and check if it's seen */
irq_mask = probe_irq_on(); irq_mask = probe_irq_on();

2
drivers/net/eepro100.c
View File

@ -977,7 +977,7 @@ speedo_open(struct net_device *dev)
sp->in_interrupt = 0; sp->in_interrupt = 0;
/* .. we can safely take handler calls during init. */ /* .. 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) { if (retval) {
return retval; return retval;
} }

2
drivers/net/epic100.c
View File

@ -713,7 +713,7 @@ static int epic_open(struct net_device *dev)
/* Soft reset the chip. */ /* Soft reset the chip. */
outl(0x4001, ioaddr + GENCTL); 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; return retval;
epic_init_ring(dev); epic_init_ring(dev);

2
drivers/net/fealnx.c
View File

@ -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; return -EAGAIN;
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++)

18
drivers/net/forcedeth.c
View File

@ -2622,21 +2622,21 @@ static int nv_request_irq(struct net_device *dev, int intr_test)
np->msi_flags |= NV_MSI_X_ENABLED; np->msi_flags |= NV_MSI_X_ENABLED;
if (optimization_mode == NV_OPTIMIZATION_MODE_THROUGHPUT && !intr_test) { if (optimization_mode == NV_OPTIMIZATION_MODE_THROUGHPUT && !intr_test) {
/* Request irq for rx handling */ /* 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); printk(KERN_INFO "forcedeth: request_irq failed for rx %d\n", ret);
pci_disable_msix(np->pci_dev); pci_disable_msix(np->pci_dev);
np->msi_flags &= ~NV_MSI_X_ENABLED; np->msi_flags &= ~NV_MSI_X_ENABLED;
goto out_err; goto out_err;
} }
/* Request irq for tx handling */ /* 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); printk(KERN_INFO "forcedeth: request_irq failed for tx %d\n", ret);
pci_disable_msix(np->pci_dev); pci_disable_msix(np->pci_dev);
np->msi_flags &= ~NV_MSI_X_ENABLED; np->msi_flags &= ~NV_MSI_X_ENABLED;
goto out_free_rx; goto out_free_rx;
} }
/* Request irq for link and timer handling */ /* 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); printk(KERN_INFO "forcedeth: request_irq failed for link %d\n", ret);
pci_disable_msix(np->pci_dev); pci_disable_msix(np->pci_dev);
np->msi_flags &= ~NV_MSI_X_ENABLED; np->msi_flags &= ~NV_MSI_X_ENABLED;
@ -2651,9 +2651,9 @@ static int nv_request_irq(struct net_device *dev, int intr_test)
} else { } else {
/* Request irq for all interrupts */ /* Request irq for all interrupts */
if ((!intr_test && 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); printk(KERN_INFO "forcedeth: request_irq failed %d\n", ret);
pci_disable_msix(np->pci_dev); pci_disable_msix(np->pci_dev);
np->msi_flags &= ~NV_MSI_X_ENABLED; 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 != 0 && np->msi_flags & NV_MSI_CAPABLE) {
if ((ret = pci_enable_msi(np->pci_dev)) == 0) { if ((ret = pci_enable_msi(np->pci_dev)) == 0) {
np->msi_flags |= NV_MSI_ENABLED; np->msi_flags |= NV_MSI_ENABLED;
if ((!intr_test && request_irq(np->pci_dev->irq, &nv_nic_irq, 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, SA_SHIRQ, 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); printk(KERN_INFO "forcedeth: request_irq failed %d\n", ret);
pci_disable_msi(np->pci_dev); pci_disable_msi(np->pci_dev);
np->msi_flags &= ~NV_MSI_ENABLED; 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) || 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, SA_SHIRQ, 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;
} }

2
drivers/net/fs_enet/fs_enet-main.c
View File

@ -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); struct fs_enet_private *fep = netdev_priv(dev);
(*fep->ops->pre_request_irq)(dev, irq); (*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)

2
drivers/net/gt96100eth.c
View File

@ -1030,7 +1030,7 @@ gt96100_open(struct net_device *dev)
} }
if ((retval = request_irq(dev->irq, &gt96100_interrupt, if ((retval = request_irq(dev->irq, &gt96100_interrupt,
SA_SHIRQ, dev->name, dev))) { IRQF_SHARED, dev->name, dev))) {
err("unable to get IRQ %d\n", dev->irq); err("unable to get IRQ %d\n", dev->irq);
return retval; return retval;
} }

2
drivers/net/hamachi.c
View File

@ -871,7 +871,7 @@ static int hamachi_open(struct net_device *dev)
u32 rx_int_var, tx_int_var; u32 rx_int_var, tx_int_var;
u16 fifo_info; 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) if (i)
return i; return i;

2
drivers/net/hamradio/baycom_ser_fdx.c
View File

@ -434,7 +434,7 @@ static int ser12_open(struct net_device *dev)
outb(0, FCR(dev->base_addr)); /* disable FIFOs */ outb(0, FCR(dev->base_addr)); /* disable FIFOs */
outb(0x0d, MCR(dev->base_addr)); outb(0x0d, MCR(dev->base_addr));
outb(0, IER(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)) { "baycom_ser_fdx", dev)) {
release_region(dev->base_addr, SER12_EXTENT); release_region(dev->base_addr, SER12_EXTENT);
return -EBUSY; return -EBUSY;

2
drivers/net/hamradio/baycom_ser_hdx.c
View File

@ -488,7 +488,7 @@ static int ser12_open(struct net_device *dev)
outb(0, FCR(dev->base_addr)); /* disable FIFOs */ outb(0, FCR(dev->base_addr)); /* disable FIFOs */
outb(0x0d, MCR(dev->base_addr)); outb(0x0d, MCR(dev->base_addr));
outb(0, IER(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)) { "baycom_ser12", dev)) {
release_region(dev->base_addr, SER12_EXTENT); release_region(dev->base_addr, SER12_EXTENT);
return -EBUSY; return -EBUSY;

2
drivers/net/hamradio/scc.c
View File

@ -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); printk(KERN_WARNING "z8530drv: warning, cannot get IRQ %d\n", hwcfg.irq);
else else
Ivec[hwcfg.irq].used = 1; Ivec[hwcfg.irq].used = 1;

2
drivers/net/hamradio/yam.c
View File

@ -873,7 +873,7 @@ static int yam_open(struct net_device *dev)
goto out_release_base; goto out_release_base;
} }
outb(0, IER(dev->base_addr)); 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); printk(KERN_ERR "%s: irq %d busy\n", dev->name, dev->irq);
ret = -EBUSY; ret = -EBUSY;
goto out_release_base; goto out_release_base;

2
drivers/net/hp100.c
View File

@ -1079,7 +1079,7 @@ static int hp100_open(struct net_device *dev)
/* New: if bus is PCI or EISA, interrupts might be shared interrupts */ /* New: if bus is PCI or EISA, interrupts might be shared interrupts */
if (request_irq(dev->irq, hp100_interrupt, if (request_irq(dev->irq, hp100_interrupt,
lp->bus == HP100_BUS_PCI || lp->bus == lp->bus == HP100_BUS_PCI || lp->bus ==
HP100_BUS_EISA ? SA_SHIRQ : SA_INTERRUPT, HP100_BUS_EISA ? IRQF_SHARED : IRQF_DISABLED,
"hp100", dev)) { "hp100", dev)) {
printk("hp100: %s: unable to get IRQ %d\n", dev->name, dev->irq); printk("hp100: %s: unable to get IRQ %d\n", dev->name, dev->irq);
return -EAGAIN; return -EAGAIN;

2
drivers/net/hydra.c
View File

@ -117,7 +117,7 @@ static int __devinit hydra_init(struct zorro_dev *z)
dev->irq = IRQ_AMIGA_PORTS; dev->irq = IRQ_AMIGA_PORTS;
/* Install the Interrupt handler */ /* 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)) { dev)) {
free_netdev(dev); free_netdev(dev);
return -EAGAIN; return -EAGAIN;

2
drivers/net/ibmlana.c
View File

@ -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) { if (result != 0) {
printk(KERN_ERR "%s: failed to register irq %d\n", dev->name, dev->irq); printk(KERN_ERR "%s: failed to register irq %d\n", dev->name, dev->irq);
return result; return result;

2
drivers/net/ioc3-eth.c
View File

@ -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); printk(KERN_ERR "%s: Can't get irq %d\n", dev->name, dev->irq);
return -EAGAIN; return -EAGAIN;

4
drivers/net/irda/donauboe.c
View File

@ -1372,7 +1372,7 @@ toshoboe_net_open (struct net_device *dev)
return 0; return 0;
if (request_irq (self->io.irq, toshoboe_interrupt, 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_base = self->base;
self->io.fir_ext = OBOE_IO_EXTENT; self->io.fir_ext = OBOE_IO_EXTENT;
self->io.irq = pci_dev->irq; 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->speed = self->io.speed = 9600;
self->async = 0; self->async = 0;

2
drivers/net/irda/vlsi_ir.c
View File

@ -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)) { drivername, ndev)) {
IRDA_WARNING("%s: couldn't get IRQ: %d\n", IRDA_WARNING("%s: couldn't get IRQ: %d\n",
__FUNCTION__, ndev->irq); __FUNCTION__, ndev->irq);

2
drivers/net/ixgb/ixgb_main.c
View File

@ -253,7 +253,7 @@ ixgb_up(struct ixgb_adapter *adapter)
#endif #endif
if((err = request_irq(adapter->pdev->irq, &ixgb_intr, if((err = request_irq(adapter->pdev->irq, &ixgb_intr,
SA_SHIRQ | SA_SAMPLE_RANDOM, IRQF_SHARED | IRQF_SAMPLE_RANDOM,
netdev->name, netdev))) { netdev->name, netdev))) {
DPRINTK(PROBE, ERR, DPRINTK(PROBE, ERR,
"Unable to allocate interrupt Error: %d\n", err); "Unable to allocate interrupt Error: %d\n", err);

2
drivers/net/ixp2000/ixpdev.c
View File

@ -235,7 +235,7 @@ static int ixpdev_open(struct net_device *dev)
if (!nds_open++) { if (!nds_open++) {
err = request_irq(IRQ_IXP2000_THDA0, ixpdev_interrupt, err = request_irq(IRQ_IXP2000_THDA0, ixpdev_interrupt,
SA_SHIRQ, "ixp2000_eth", nds); IRQF_SHARED, "ixp2000_eth", nds);
if (err) { if (err) {
nds_open--; nds_open--;
return err; return err;

2
drivers/net/jazzsonic.c
View File

@ -260,7 +260,7 @@ MODULE_DESCRIPTION("Jazz SONIC ethernet driver");
module_param(sonic_debug, int, 0); module_param(sonic_debug, int, 0);
MODULE_PARM_DESC(sonic_debug, "jazzsonic debug level (1-4)"); 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"

2
drivers/net/lp486e.c
View File

@ -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) { if (i) {
printk(KERN_ERR "%s: IRQ %d not free\n", dev->name, dev->irq); printk(KERN_ERR "%s: IRQ %d not free\n", dev->name, dev->irq);
return i; return i;

2
drivers/net/mipsnet.c
View File

@ -179,7 +179,7 @@ static int mipsnet_open(struct net_device *dev)
pr_debug("%s: mipsnet_open\n", dev->name); pr_debug("%s: mipsnet_open\n", dev->name);
err = request_irq(dev->irq, &mipsnet_interrupt, err = request_irq(dev->irq, &mipsnet_interrupt,
SA_SHIRQ, dev->name, (void *) dev); IRQF_SHARED, dev->name, (void *) dev);
if (err) { if (err) {
pr_debug("%s: %s(): can't get irq %d\n", pr_debug("%s: %s(): can't get irq %d\n",

2
drivers/net/mv643xx_eth.c
View File

@ -778,7 +778,7 @@ static int mv643xx_eth_open(struct net_device *dev)
int err; int err;
err = request_irq(dev->irq, mv643xx_eth_int_handler, 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) { if (err) {
printk(KERN_ERR "Can not assign IRQ number to MV643XX_eth%d\n", printk(KERN_ERR "Can not assign IRQ number to MV643XX_eth%d\n",
port_num); port_num);

4
drivers/net/myri10ge/myri10ge.c
View File

@ -2413,7 +2413,7 @@ static int myri10ge_resume(struct pci_dev *pdev)
pci_enable_device(pdev); pci_enable_device(pdev);
pci_set_master(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); netdev->name, mgp);
if (status != 0) { if (status != 0) {
dev_err(&pdev->dev, "failed to allocate IRQ\n"); 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); netdev->name, mgp);
if (status != 0) { if (status != 0) {
dev_err(&pdev->dev, "failed to allocate IRQ\n"); dev_err(&pdev->dev, "failed to allocate IRQ\n");

2
drivers/net/myri_sbus.c
View File

@ -1069,7 +1069,7 @@ static int __init myri_ether_init(struct sbus_dev *sdev)
/* Register interrupt handler now. */ /* Register interrupt handler now. */
DET(("Requesting MYRIcom IRQ line.\n")); DET(("Requesting MYRIcom IRQ line.\n"));
if (request_irq(dev->irq, &myri_interrupt, 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"); printk("MyriCOM: Cannot register interrupt handler.\n");
goto err; goto err;
} }

2
drivers/net/natsemi.c
View File

@ -1574,7 +1574,7 @@ static int netdev_open(struct net_device *dev)
/* Reset the chip, just in case. */ /* Reset the chip, just in case. */
natsemi_reset(dev); 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 (i) return i;
if (netif_msg_ifup(np)) if (netif_msg_ifup(np))

2
drivers/net/ne2k-pci.c
View File

@ -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) if (ret)
return ret; return ret;

2
drivers/net/netx-eth.c
View File

@ -223,7 +223,7 @@ static int netx_eth_open(struct net_device *ndev)
struct netx_eth_priv *priv = netdev_priv(ndev); struct netx_eth_priv *priv = netdev_priv(ndev);
if (request_irq 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; return -EAGAIN;
writel(ndev->dev_addr[0] | writel(ndev->dev_addr[0] |

2
drivers/net/ns83820.c
View File

@ -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); DRV_NAME, ndev);
if (err) { if (err) {
printk(KERN_INFO "ns83820: unable to register irq %d\n", printk(KERN_INFO "ns83820: unable to register irq %d\n",

2
drivers/net/pci-skeleton.c
View File

@ -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) { if (retval) {
DPRINTK ("EXIT, returning %d\n", retval); DPRINTK ("EXIT, returning %d\n", retval);
return retval; return retval;

2
drivers/net/pcmcia/axnet_cs.c
View File

@ -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; info->link_status = 0x00;
init_timer(&info->watchdog); init_timer(&info->watchdog);

2
drivers/net/pcmcia/pcnet_cs.c
View File

@ -998,7 +998,7 @@ static int pcnet_open(struct net_device *dev)
link->open++; link->open++;
set_misc_reg(dev); 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->phy_id = info->eth_phy;
info->link_status = 0x00; info->link_status = 0x00;

2
drivers/net/pcnet32.c
View File

@ -1541,7 +1541,7 @@ static int pcnet32_open(struct net_device *dev)
unsigned long flags; unsigned long flags;
if (request_irq(dev->irq, &pcnet32_interrupt, 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)) { (void *)dev)) {
return -EAGAIN; return -EAGAIN;
} }

2
drivers/net/phy/phy.c
View File

@ -556,7 +556,7 @@ int phy_start_interrupts(struct phy_device *phydev)
INIT_WORK(&phydev->phy_queue, phy_change, phydev); INIT_WORK(&phydev->phy_queue, phy_change, phydev);
if (request_irq(phydev->irq, phy_interrupt, if (request_irq(phydev->irq, phy_interrupt,
SA_SHIRQ, IRQF_SHARED,
"phy_interrupt", "phy_interrupt",
phydev) < 0) { phydev) < 0) {
printk(KERN_WARNING "%s: Can't get IRQ %d (PHY)\n", printk(KERN_WARNING "%s: Can't get IRQ %d (PHY)\n",

2
drivers/net/r8169.c
View File

@ -1726,7 +1726,7 @@ static int rtl8169_open(struct net_device *dev)
rtl8169_set_rxbufsize(tp, dev); rtl8169_set_rxbufsize(tp, dev);
retval = 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) if (retval < 0)
goto out; goto out;

2
drivers/net/rrunner.c
View File

@ -1252,7 +1252,7 @@ static int rr_open(struct net_device *dev)
readl(&regs->HostCtrl); readl(&regs->HostCtrl);
spin_unlock_irqrestore(&rrpriv->lock, flags); 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", printk(KERN_WARNING "%s: Requested IRQ %d is busy\n",
dev->name, dev->irq); dev->name, dev->irq);
ecode = -EAGAIN; ecode = -EAGAIN;

4
drivers/net/s2io.c
View File

@ -3761,7 +3761,7 @@ static int s2io_open(struct net_device *dev)
/* After proper initialization of H/W, register ISR */ /* After proper initialization of H/W, register ISR */
if (sp->intr_type == MSI) { if (sp->intr_type == MSI) {
err = request_irq((int) sp->pdev->irq, s2io_msi_handle, err = request_irq((int) sp->pdev->irq, s2io_msi_handle,
SA_SHIRQ, sp->name, dev); IRQF_SHARED, sp->name, dev);
if (err) { if (err) {
DBG_PRINT(ERR_DBG, "%s: MSI registration \ DBG_PRINT(ERR_DBG, "%s: MSI registration \
failed\n", dev->name); 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); sp->name, dev);
if (err) { if (err) {
DBG_PRINT(ERR_DBG, "%s: ISR registration failed\n", DBG_PRINT(ERR_DBG, "%s: ISR registration failed\n",

2
drivers/net/sb1250-mac.c
View File

@ -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;
/* /*

2
drivers/net/sis190.c
View File

@ -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) if (rc < 0)
goto err_release_timer_2; goto err_release_timer_2;

2
drivers/net/sis900.c
View File

@ -1013,7 +1013,7 @@ sis900_open(struct net_device *net_dev)
/* Equalizer workaround Rule */ /* Equalizer workaround Rule */
sis630_set_eq(net_dev, sis_priv->chipset_rev); 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); net_dev->name, net_dev);
if (ret) if (ret)
return ret; return ret;

8
drivers/net/sk98lin/skge.c
View File

@ -570,9 +570,9 @@ SK_BOOL DualNet;
spin_unlock_irqrestore(&pAC->SlowPathLock, Flags); spin_unlock_irqrestore(&pAC->SlowPathLock, Flags);
if (pAC->GIni.GIMacsFound == 2) { 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); "sk98lin", dev);
} else { } else {
printk(KERN_WARNING "sk98lin: Illegal number of ports: %d\n", 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_enable_device(pdev);
pci_set_master(pdev); pci_set_master(pdev);
if (pAC->GIni.GIMacsFound == 2) 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) { if (ret) {
printk(KERN_WARNING "sk98lin: unable to acquire IRQ %d\n", dev->irq); printk(KERN_WARNING "sk98lin: unable to acquire IRQ %d\n", dev->irq);
pAC->AllocFlag &= ~SK_ALLOC_IRQ; pAC->AllocFlag &= ~SK_ALLOC_IRQ;

2
drivers/net/sk_mca.c
View File

@ -824,7 +824,7 @@ static int skmca_open(struct net_device *dev)
/* register resources - only necessary for IRQ */ /* register resources - only necessary for IRQ */
result = result =
request_irq(priv->realirq, irq_handler, 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) { if (result != 0) {
printk("%s: failed to register irq %d\n", dev->name, printk("%s: failed to register irq %d\n", dev->name,
dev->irq); dev->irq);

2
drivers/net/skfp/skfddi.c
View File

@ -497,7 +497,7 @@ static int skfp_open(struct net_device *dev)
PRINTK(KERN_INFO "entering skfp_open\n"); PRINTK(KERN_INFO "entering skfp_open\n");
/* Register IRQ - support shared interrupts by passing device ptr */ /* 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); dev->name, dev);
if (err) if (err)
return err; return err;

2
drivers/net/skge.c
View File

@ -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) { if (err) {
printk(KERN_ERR PFX "%s: cannot assign irq %d\n", printk(KERN_ERR PFX "%s: cannot assign irq %d\n",
pci_name(pdev), pdev->irq); pci_name(pdev), pdev->irq);

4
drivers/net/sky2.c
View File

@ -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) { if (err) {
printk(KERN_ERR PFX "%s: cannot assign irq %d\n", printk(KERN_ERR PFX "%s: cannot assign irq %d\n",
pci_name(pdev), pdev->irq); 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) { if (err) {
printk(KERN_ERR PFX "%s: cannot assign irq %d\n", printk(KERN_ERR PFX "%s: cannot assign irq %d\n",
pci_name(pdev), pdev->irq); pci_name(pdev), pdev->irq);

2
drivers/net/smc-ultra32.c
View File

@ -290,7 +290,7 @@ out:
static int ultra32_open(struct net_device *dev) static int ultra32_open(struct net_device *dev)
{ {
int ioaddr = dev->base_addr - ULTRA32_NIC_OFFSET; /* ASIC addr */ 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; int retval;
retval = request_irq(dev->irq, ei_interrupt, irq_flags, dev->name, dev); retval = request_irq(dev->irq, ei_interrupt, irq_flags, dev->name, dev);

2
drivers/net/smc911x.c
View File

@ -2081,7 +2081,7 @@ static int __init smc911x_probe(struct net_device *dev, unsigned long ioaddr)
lp->ctl_rspeed = 100; lp->ctl_rspeed = 100;
/* Grab the IRQ */ /* 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) if (retval)
goto err_out; goto err_out;

4
drivers/net/smc91x.h
View File

@ -207,7 +207,7 @@ SMC_outw(u16 val, void __iomem *ioaddr, int reg)
machine_is_omap_h2() \ machine_is_omap_h2() \
|| machine_is_omap_h3() \ || machine_is_omap_h3() \
|| (machine_is_omap_innovator() && !cpu_is_omap1510()) \ || (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 #endif
#ifndef SMC_IRQ_FLAGS #ifndef SMC_IRQ_FLAGS
#define SMC_IRQ_FLAGS SA_TRIGGER_RISING #define SMC_IRQ_FLAGS IRQF_TRIGGER_RISING
#endif #endif
#ifndef SMC_INTERRUPT_PREAMBLE #ifndef SMC_INTERRUPT_PREAMBLE

2
drivers/net/spider_net.c
View File

@ -1744,7 +1744,7 @@ spider_net_open(struct net_device *netdev)
result = -EBUSY; result = -EBUSY;
if (request_irq(netdev->irq, spider_net_interrupt, if (request_irq(netdev->irq, spider_net_interrupt,
SA_SHIRQ, netdev->name, netdev)) IRQF_SHARED, netdev->name, netdev))
goto register_int_failed; goto register_int_failed;
spider_net_enable_card(card); spider_net_enable_card(card);

2
drivers/net/starfire.c
View File

@ -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) if (retval)
return retval; return retval;

2
drivers/net/sun3lance.c
View File

@ -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;

2
drivers/net/sunbmac.c
View File

@ -918,7 +918,7 @@ static int bigmac_open(struct net_device *dev)
struct bigmac *bp = (struct bigmac *) dev->priv; struct bigmac *bp = (struct bigmac *) dev->priv;
int ret; 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) { if (ret) {
printk(KERN_ERR "BIGMAC: Can't order irq %d to go.\n", dev->irq); printk(KERN_ERR "BIGMAC: Can't order irq %d to go.\n", dev->irq);
return ret; return ret;

2
drivers/net/sundance.c
View File

@ -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) if (i)
return i; return i;

2
drivers/net/sungem.c
View File

@ -2220,7 +2220,7 @@ static int gem_do_start(struct net_device *dev)
spin_unlock_irqrestore(&gp->lock, flags); spin_unlock_irqrestore(&gp->lock, flags);
if (request_irq(gp->pdev->irq, gem_interrupt, 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); printk(KERN_ERR "%s: failed to request irq !\n", gp->dev->name);
spin_lock_irqsave(&gp->lock, flags); spin_lock_irqsave(&gp->lock, flags);

4
drivers/net/sunhme.c
View File

@ -2194,7 +2194,7 @@ static int happy_meal_open(struct net_device *dev)
*/ */
if ((hp->happy_flags & (HFLAG_QUATTRO|HFLAG_PCI)) != HFLAG_QUATTRO) { if ((hp->happy_flags & (HFLAG_QUATTRO|HFLAG_PCI)) != HFLAG_QUATTRO) {
if (request_irq(dev->irq, &happy_meal_interrupt, if (request_irq(dev->irq, &happy_meal_interrupt,
SA_SHIRQ, dev->name, (void *)dev)) { IRQF_SHARED, dev->name, (void *)dev)) {
HMD(("EAGAIN\n")); HMD(("EAGAIN\n"));
printk(KERN_ERR "happy_meal(SBUS): Can't order irq %d to go.\n", printk(KERN_ERR "happy_meal(SBUS): Can't order irq %d to go.\n",
dev->irq); dev->irq);
@ -2608,7 +2608,7 @@ static void __init quattro_sbus_register_irqs(void)
err = request_irq(sdev->irqs[0], err = request_irq(sdev->irqs[0],
quattro_sbus_interrupt, quattro_sbus_interrupt,
SA_SHIRQ, "Quattro", IRQF_SHARED, "Quattro",
qp); qp);
if (err != 0) { if (err != 0) {
printk(KERN_ERR "Quattro: Fatal IRQ registery error %d.\n", err); printk(KERN_ERR "Quattro: Fatal IRQ registery error %d.\n", err);

2
drivers/net/sunlance.c
View File

@ -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)) { lancestr, (void *) dev)) {
printk(KERN_ERR "Lance: Can't get irq %d\n", dev->irq); printk(KERN_ERR "Lance: Can't get irq %d\n", dev->irq);
return -EAGAIN; return -EAGAIN;

2
drivers/net/sunqe.c
View File

@ -811,7 +811,7 @@ static struct sunqec * __init get_qec(struct sbus_dev *child_sdev)
qec_init_once(qecp, qec_sdev); qec_init_once(qecp, qec_sdev);
if (request_irq(qec_sdev->irqs[0], &qec_interrupt, 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"); printk(KERN_ERR "qec: Can't register irq.\n");
goto fail; goto fail;
} }

2
drivers/net/tc35815.c
View File

@ -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;
} }

6
drivers/net/tg3.c
View File

@ -6702,12 +6702,12 @@ static int tg3_request_irq(struct tg3 *tp)
fn = tg3_msi; fn = tg3_msi;
if (tp->tg3_flags2 & TG3_FLG2_1SHOT_MSI) if (tp->tg3_flags2 & TG3_FLG2_1SHOT_MSI)
fn = tg3_msi_1shot; fn = tg3_msi_1shot;
flags = SA_SAMPLE_RANDOM; flags = IRQF_SAMPLE_RANDOM;
} else { } else {
fn = tg3_interrupt; fn = tg3_interrupt;
if (tp->tg3_flags & TG3_FLAG_TAGGED_STATUS) if (tp->tg3_flags & TG3_FLAG_TAGGED_STATUS)
fn = tg3_interrupt_tagged; 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); free_irq(tp->pdev->irq, dev);
err = request_irq(tp->pdev->irq, tg3_test_isr, 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) if (err)
return err; return err;

2
drivers/net/tlan.c
View File

@ -943,7 +943,7 @@ static int TLan_Open( struct net_device *dev )
int err; int err;
priv->tlanRev = TLan_DioRead8( dev->base_addr, TLAN_DEF_REVISION ); 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 ) { if ( err ) {
printk(KERN_ERR "TLAN: Cannot open %s because IRQ %d is already in use.\n", dev->name, dev->irq ); printk(KERN_ERR "TLAN: Cannot open %s because IRQ %d is already in use.\n", dev->name, dev->irq );

2
drivers/net/tokenring/3c359.c
View File

@ -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;
} }

2
drivers/net/tokenring/abyss.c
View File

@ -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); dev->name, dev);
if (ret) if (ret)
goto err_out_region; goto err_out_region;

2
drivers/net/tokenring/lanstreamer.c
View File

@ -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; return -EAGAIN;
} }
#if STREAMER_DEBUG #if STREAMER_DEBUG

2
drivers/net/tokenring/madgemc.c
View File

@ -311,7 +311,7 @@ static int __devinit madgemc_probe(struct device *device)
*/ */
outb(0, dev->base_addr + MC_CONTROL_REG0); /* sanity */ outb(0, dev->base_addr + MC_CONTROL_REG0); /* sanity */
madgemc_setsifsel(dev, 1); madgemc_setsifsel(dev, 1);
if (request_irq(dev->irq, madgemc_interrupt, SA_SHIRQ, if (request_irq(dev->irq, madgemc_interrupt, IRQF_SHARED,
"madgemc", dev)) { "madgemc", dev)) {
ret = -EBUSY; ret = -EBUSY;
goto getout3; goto getout3;

2
drivers/net/tokenring/olympic.c
View File

@ -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;
} }

4
drivers/net/tokenring/smctr.c
View File

@ -531,7 +531,7 @@ static int __init smctr_chk_mca(struct net_device *dev)
dev->irq = 15; dev->irq = 15;
break; 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); release_region(dev->base_addr, SMCTR_IO_EXTENT);
return -ENODEV; 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; goto out2;
/* Get 58x Rom Base */ /* Get 58x Rom Base */

2
drivers/net/tokenring/tmspci.c
View File

@ -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); dev->name, dev);
if (ret) if (ret)
goto err_out_region; goto err_out_region;

2
drivers/net/tulip/de2104x.c
View File

@ -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) { if (rc) {
printk(KERN_ERR "%s: IRQ %d request failure, err=%d\n", printk(KERN_ERR "%s: IRQ %d request failure, err=%d\n",
dev->name, dev->irq, rc); dev->name, dev->irq, rc);

8
drivers/net/tulip/de4x5.c
View File

@ -292,7 +292,7 @@
0.41 21-Mar-96 Don't check for get_hw_addr checksum unless DEC card 0.41 21-Mar-96 Don't check for get_hw_addr checksum unless DEC card
only <niles@axp745gsfc.nasa.gov> only <niles@axp745gsfc.nasa.gov>
Fix for multiple PCI cards reported by <jos@xos.nl> 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[]. Fix SMC ethernet address in enet_det[].
Print chip name instead of "UNKNOWN" during boot. Print chip name instead of "UNKNOWN" during boot.
0.42 26-Apr-96 Fix MII write TA bit error. 0.42 26-Apr-96 Fix MII write TA bit error.
@ -353,7 +353,7 @@
infoblocks. infoblocks.
Added DC21142 and DC21143 functions. Added DC21142 and DC21143 functions.
Added byte counters from <phil@tazenda.demon.co.uk> Added byte counters from <phil@tazenda.demon.co.uk>
Added SA_INTERRUPT temporary fix from Added IRQF_DISABLED temporary fix from
<mjacob@feral.com>. <mjacob@feral.com>.
0.53 12-Nov-97 Fix the *_probe() to include 'eth??' name during 0.53 12-Nov-97 Fix the *_probe() to include 'eth??' name during
module load: bug reported by module load: bug reported by
@ -1319,10 +1319,10 @@ de4x5_open(struct net_device *dev)
lp->state = OPEN; lp->state = OPEN;
de4x5_dbg_open(dev); 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)) { lp->adapter_name, dev)) {
printk("de4x5_open(): Requested IRQ%d is busy - attemping FAST/SHARE...", dev->irq); 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)) { lp->adapter_name, dev)) {
printk("\n Cannot get IRQ- reconfigure your hardware.\n"); printk("\n Cannot get IRQ- reconfigure your hardware.\n");
disable_ast(dev); disable_ast(dev);

2
drivers/net/tulip/dmfe.c
View File

@ -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) if (ret)
return ret; return ret;

4
drivers/net/tulip/tulip_core.c
View File

@ -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; return retval;
tulip_init_ring (dev); 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"); printk (KERN_ERR "tulip: request_irq failed in resume\n");
return retval; return retval;
} }

2
drivers/net/tulip/uli526x.c
View File

@ -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) if (ret)
return ret; return ret;

2
drivers/net/tulip/winbond-840.c
View File

@ -658,7 +658,7 @@ static int netdev_open(struct net_device *dev)
iowrite32(0x00000001, ioaddr + PCIBusCfg); /* Reset */ iowrite32(0x00000001, ioaddr + PCIBusCfg); /* Reset */
netif_device_detach(dev); 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) if (i)
goto out_err; goto out_err;

2
drivers/net/tulip/xircom_cb.c
View File

@ -457,7 +457,7 @@ static int xircom_open(struct net_device *dev)
int retval; int retval;
enter("xircom_open"); enter("xircom_open");
printk(KERN_INFO "xircom cardbus adaptor found, registering as %s, using irq %i \n",dev->name,dev->irq); 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) { if (retval) {
leave("xircom_open - No IRQ"); leave("xircom_open - No IRQ");
return retval; return retval;

2
drivers/net/tulip/xircom_tulip_cb.c
View File

@ -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; return -EAGAIN;
xircom_up(dev); xircom_up(dev);

Some files were not shown because too many files have changed in this diff Show More