* [PATCH net-next-2.6][atm]: remove IRQF_DISABLED in combination with IRQF_SHARED
@ 2010-07-10 13:42 chas williams - CONTRACTOR
2010-07-13 3:34 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: chas williams - CONTRACTOR @ 2010-07-10 13:42 UTC (permalink / raw
To: netdev
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>
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);
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH net-next-2.6][atm]: remove IRQF_DISABLED in combination with IRQF_SHARED
2010-07-10 13:42 [PATCH net-next-2.6][atm]: remove IRQF_DISABLED in combination with IRQF_SHARED chas williams - CONTRACTOR
@ 2010-07-13 3:34 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2010-07-13 3:34 UTC (permalink / raw
To: chas; +Cc: netdev
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.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-07-13 3:33 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-07-10 13:42 [PATCH net-next-2.6][atm]: remove IRQF_DISABLED in combination with IRQF_SHARED chas williams - CONTRACTOR
2010-07-13 3:34 ` David Miller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.