Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 31635
b: refs/heads/master
c: 1fb9df5
h: refs/heads/master
i:
  31633: e5e2f98
  31631: 0c042bd
v: v3
  • Loading branch information
Thomas Gleixner authored and Linus Torvalds committed Jul 2, 2006
1 parent c3d9dbd commit f104b39
Show file tree
Hide file tree
Showing 129 changed files with 160 additions and 160 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: dace145374b8e39aeb920304c358ab5e220341ab
refs/heads/master: 1fb9df5d3069064c037c81c0ab8bf783ffa5e373
2 changes: 1 addition & 1 deletion trunk/drivers/net/3c515.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
} 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;
}
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/net/3c523.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ static int elmc_open(struct net_device *dev)

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);
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/net/3c527.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -435,7 +435,7 @@ static int __init mc32_probe1(struct net_device *dev, int slot)
* 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);
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/net/3c59x.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 ?
&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;
Expand Down Expand Up @@ -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 ?
&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;
}
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/net/8139cp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1203,7 +1203,7 @@ static int cp_open (struct net_device *dev)

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;

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/net/8139too.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1310,7 +1310,7 @@ static int rtl8139_open (struct net_device *dev)
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;

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/net/a2065.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -495,7 +495,7 @@ static int lance_open (struct net_device *dev)
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;

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/net/acenic.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1194,7 +1194,7 @@ static int __devinit ace_init(struct net_device *dev)
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",
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/net/amd8111e.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1376,7 +1376,7 @@ static int amd8111e_open(struct net_device * 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;

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/net/apne.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ static int __init apne_probe1(struct net_device *dev, int ioaddr)
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++) {
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/net/arcnet/com20020-pci.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ static int __devinit com20020pci_probe(struct pci_dev *pdev, const struct pci_de
goto out_port;
}

if ((err = com20020_found(dev, SA_SHIRQ)) != 0)
if ((err = com20020_found(dev, IRQF_SHARED)) != 0)
goto out_port;

return 0;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/net/ariadne.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@ static int ariadne_open(struct net_device *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;

Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/net/b44.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1421,7 +1421,7 @@ static int b44_open(struct net_device *dev)

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);
Expand Down Expand Up @@ -2322,7 +2322,7 @@ static int b44_resume(struct pci_dev *pdev)
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);
Expand Down
6 changes: 3 additions & 3 deletions trunk/drivers/net/bnx2.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4260,11 +4260,11 @@ bnx2_open(struct net_device *dev)
}
else {
rc = request_irq(bp->pdev->irq, bnx2_interrupt,
SA_SHIRQ, dev->name, dev);
IRQF_SHARED, dev->name, dev);
}
}
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) {
Expand Down Expand Up @@ -4311,7 +4311,7 @@ bnx2_open(struct net_device *dev)

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);
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/net/cassini.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4349,7 +4349,7 @@ static int cas_open(struct net_device *dev)
* 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;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/net/chelsio/cxgb2.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ static int cxgb_up(struct adapter *adapter)

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;
}
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/net/cris/eth_v10.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
SA_SAMPLE_RANDOM, cardname, (void *)dev)) {
IRQF_SAMPLE_RANDOM, cardname, (void *)dev)) {
goto grace_exit0;
}

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/net/defxx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1228,7 +1228,7 @@ static int dfx_open(struct net_device *dev)

/* 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;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/net/dgrs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1191,7 +1191,7 @@ dgrs_probe1(struct net_device *dev)
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;

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/net/dl2k.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -440,7 +440,7 @@ rio_open (struct net_device *dev)
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;

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/net/dm9000.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -603,7 +603,7 @@ dm9000_open(struct net_device *dev)

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 */
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/net/e100.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
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);
Expand Down
6 changes: 3 additions & 3 deletions trunk/drivers/net/e1000/e1000_ethtool.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
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;
} 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;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/net/e1000/e1000_main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -426,7 +426,7 @@ e1000_up(struct e1000_adapter *adapter)
}
#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);
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/net/eepro.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -920,7 +920,7 @@ static int eepro_grab_irq(struct net_device *dev)

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();
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/net/eepro100.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -977,7 +977,7 @@ speedo_open(struct net_device *dev)
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;
}
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/net/epic100.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -713,7 +713,7 @@ static int epic_open(struct net_device *dev)
/* 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);
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/net/fealnx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -834,7 +834,7 @@ static int netdev_open(struct net_device *dev)

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++)
Expand Down
18 changes: 9 additions & 9 deletions trunk/drivers/net/forcedeth.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
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 */
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 */
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;
Expand All @@ -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 &&
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 &&
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;
Expand All @@ -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 ((!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;
Expand All @@ -2685,8 +2685,8 @@ static int nv_request_irq(struct net_device *dev, int intr_test)
}
}
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;

}
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/net/fs_enet/fs_enet-main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
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)
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/net/gt96100eth.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1030,7 +1030,7 @@ gt96100_open(struct net_device *dev)
}

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);
return retval;
}
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/net/hamachi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -871,7 +871,7 @@ static int hamachi_open(struct net_device *dev)
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;

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/net/hamradio/baycom_ser_fdx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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));
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;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/net/hamradio/baycom_ser_hdx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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));
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;
Expand Down
Loading

0 comments on commit f104b39

Please sign in to comment.