mirror of
https://github.com/torvalds/linux.git
synced 2024-11-25 05:32:00 +00:00
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>
This commit is contained in:
parent
97b72e4320
commit
06df277a67
@ -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;
|
||||
}
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user