aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/atm
diff options
context:
space:
mode:
authorchas williams - CONTRACTOR <chas@cmf.nrl.navy.mil>2010-07-09 23:42:02 -0400
committerDavid S. Miller <davem@davemloft.net>2010-07-12 23:21:48 -0400
commit06df277a670263a073362046855851aad278d988 (patch)
tree9945871b332fb854c59a46c7e8dca29d69683de2 /drivers/atm
parent97b72e4320a9aaa4a7f1592ee7d2da7e2c9bd349 (diff)
atm: remove IRQF_DISABLED in combination with IRQF_SHARED
Signed-off-by: Chas Williams - CONTRACTOR <chas@cmf.nrl.navy.mil> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/atm')
-rw-r--r--drivers/atm/he.c3
-rw-r--r--drivers/atm/idt77252.c2
-rw-r--r--drivers/atm/nicstar.c3
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/atm/he.c b/drivers/atm/he.c
index ea9cbe596a28..fa4d600fd6f7 100644
--- a/drivers/atm/he.c
+++ b/drivers/atm/he.c
@@ -967,7 +967,8 @@ he_init_irq(struct he_dev *he_dev)
967 he_writel(he_dev, 0x0, GRP_54_MAP); 967 he_writel(he_dev, 0x0, GRP_54_MAP);
968 he_writel(he_dev, 0x0, GRP_76_MAP); 968 he_writel(he_dev, 0x0, GRP_76_MAP);
969 969
970 if (request_irq(he_dev->pci_dev->irq, he_irq_handler, IRQF_DISABLED|IRQF_SHARED, DEV_LABEL, he_dev)) { 970 if (request_irq(he_dev->pci_dev->irq,
971 he_irq_handler, IRQF_SHARED, DEV_LABEL, he_dev)) {
971 hprintk("irq %d already in use\n", he_dev->pci_dev->irq); 972 hprintk("irq %d already in use\n", he_dev->pci_dev->irq);
972 return -EINVAL; 973 return -EINVAL;
973 } 974 }
diff --git a/drivers/atm/idt77252.c b/drivers/atm/idt77252.c
index 98657a6a330d..558ad1869425 100644
--- a/drivers/atm/idt77252.c
+++ b/drivers/atm/idt77252.c
@@ -3364,7 +3364,7 @@ init_card(struct atm_dev *dev)
3364 writel(SAR_STAT_TMROF, SAR_REG_STAT); 3364 writel(SAR_STAT_TMROF, SAR_REG_STAT);
3365 } 3365 }
3366 IPRINTK("%s: Request IRQ ... ", card->name); 3366 IPRINTK("%s: Request IRQ ... ", card->name);
3367 if (request_irq(pcidev->irq, idt77252_interrupt, IRQF_DISABLED|IRQF_SHARED, 3367 if (request_irq(pcidev->irq, idt77252_interrupt, IRQF_SHARED,
3368 card->name, card) != 0) { 3368 card->name, card) != 0) {
3369 printk("%s: can't allocate IRQ.\n", card->name); 3369 printk("%s: can't allocate IRQ.\n", card->name);
3370 deinit_card(card); 3370 deinit_card(card);
diff --git a/drivers/atm/nicstar.c b/drivers/atm/nicstar.c
index 59876c66a92a..cff337ef85fd 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)
765 765
766 card->intcnt = 0; 766 card->intcnt = 0;
767 if (request_irq 767 if (request_irq
768 (pcidev->irq, &ns_irq_handler, IRQF_DISABLED | IRQF_SHARED, 768 (pcidev->irq, &ns_irq_handler, IRQF_SHARED, "nicstar", card) != 0) {
769 "nicstar", card) != 0) {
770 printk("nicstar%d: can't allocate IRQ %d.\n", i, pcidev->irq); 769 printk("nicstar%d: can't allocate IRQ %d.\n", i, pcidev->irq);
771 error = 9; 770 error = 9;
772 ns_init_card_error(card, error); 771 ns_init_card_error(card, error);