You've already forked linux-apfs
mirror of
https://github.com/linux-apfs/linux-apfs.git
synced 2026-05-01 15:00:59 -07:00
[PATCH] irq-flags: drivers/net: Use the new IRQF_ constants
Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Ingo Molnar <mingo@elte.hu> Cc: "David S. Miller" <davem@davemloft.net> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Jeff Garzik <jeff@garzik.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
committed by
Linus Torvalds
parent
dace145374
commit
1fb9df5d30
+1
-1
@@ -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;
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -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);
|
||||||
|
|||||||
+1
-1
@@ -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);
|
||||||
|
|||||||
+2
-2
@@ -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;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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;
|
||||||
|
|
||||||
|
|||||||
@@ -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;
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -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;
|
||||||
|
|
||||||
|
|||||||
@@ -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",
|
||||||
|
|||||||
@@ -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;
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -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++) {
|
||||||
|
|||||||
@@ -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;
|
||||||
|
|||||||
@@ -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;
|
||||||
|
|
||||||
|
|||||||
+2
-2
@@ -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);
|
||||||
|
|||||||
+3
-3
@@ -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);
|
||||||
|
|||||||
@@ -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;
|
||||||
|
|||||||
@@ -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;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -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;
|
||||||
|
|||||||
+1
-1
@@ -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;
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -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;
|
||||||
|
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user