| Message ID | 201007101342.o6ADg2wx019157@cmf.nrl.navy.mil |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: "chas williams - CONTRACTOR" <chas@cmf.nrl.navy.mil> Date: Sat, 10 Jul 2010 09:42:02 -0400 > From: chas williams - CONTRACTOR <chas@cmf.nrl.navy.mil> > > commit 2fae0433cf7febc4b69ff58730de1ca412846743 > Author: chas williams - CONTRACTOR <chas@relax.cmf.nrl.navy.mil> > Date: Sat Jul 10 09:38:05 2010 -0400 > > [atm]: remove IRQF_DISABLED in combination with IRQF_SHARED > > Signed-off-by: Chas Williams - CONTRACTOR <chas@cmf.nrl.navy.mil> Applied. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/atm/he.c b/drivers/atm/he.c index ea9cbe5..fa4d600 100644 --- a/drivers/atm/he.c +++ b/drivers/atm/he.c @@ -967,7 +967,8 @@ he_init_irq(struct he_dev *he_dev) he_writel(he_dev, 0x0, GRP_54_MAP); he_writel(he_dev, 0x0, GRP_76_MAP); - if (request_irq(he_dev->pci_dev->irq, he_irq_handler, IRQF_DISABLED|IRQF_SHARED, DEV_LABEL, he_dev)) { + if (request_irq(he_dev->pci_dev->irq, + he_irq_handler, IRQF_SHARED, DEV_LABEL, he_dev)) { hprintk("irq %d already in use\n", he_dev->pci_dev->irq); return -EINVAL; } diff --git a/drivers/atm/idt77252.c b/drivers/atm/idt77252.c index 98657a6..558ad18 100644 --- a/drivers/atm/idt77252.c +++ b/drivers/atm/idt77252.c @@ -3364,7 +3364,7 @@ init_card(struct atm_dev *dev) writel(SAR_STAT_TMROF, SAR_REG_STAT); } IPRINTK("%s: Request IRQ ... ", card->name); - if (request_irq(pcidev->irq, idt77252_interrupt, IRQF_DISABLED|IRQF_SHARED, + if (request_irq(pcidev->irq, idt77252_interrupt, IRQF_SHARED, card->name, card) != 0) { printk("%s: can't allocate IRQ.\n", card->name); deinit_card(card); diff --git a/drivers/atm/nicstar.c b/drivers/atm/nicstar.c index 59876c6..cff337e 100644 --- a/drivers/atm/nicstar.c +++ b/drivers/atm/nicstar.c @@ -765,8 +765,7 @@ static int __devinit ns_init_card(int i, struct pci_dev *pcidev) card->intcnt = 0; if (request_irq - (pcidev->irq, &ns_irq_handler, IRQF_DISABLED | IRQF_SHARED, - "nicstar", card) != 0) { + (pcidev->irq, &ns_irq_handler, IRQF_SHARED, "nicstar", card) != 0) { printk("nicstar%d: can't allocate IRQ %d.\n", i, pcidev->irq); error = 9; ns_init_card_error(card, error);