Commit 06df277a authored by chas williams - CONTRACTOR's avatar chas williams - CONTRACTOR Committed by David S. Miller
Browse files

atm: remove IRQF_DISABLED in combination with IRQF_SHARED 



Signed-off-by: default avatarChas Williams - CONTRACTOR <chas@cmf.nrl.navy.mil>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 97b72e43

drivers/atm/he.c

+2 −1
Original line number Diff line number Diff line
@@ -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;

	}

drivers/atm/idt77252.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/atm/nicstar.c

+1 −2
Original line number Diff line number Diff line
@@ -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);