From 06df277a670263a073362046855851aad278d988 Mon Sep 17 00:00:00 2001 From: chas williams - CONTRACTOR Date: Sat, 10 Jul 2010 03:42:02 +0000 Subject: atm: remove IRQF_DISABLED in combination with IRQF_SHARED Signed-off-by: Chas Williams - CONTRACTOR Signed-off-by: David S. Miller --- drivers/atm/idt77252.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/atm/idt77252.c') diff --git a/drivers/atm/idt77252.c b/drivers/atm/idt77252.c index 98657a6a330..558ad186942 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); -- cgit v1.2.3 From e80d3f08e2ff055b060785442a7b47c263d7e978 Mon Sep 17 00:00:00 2001 From: Peter Huewe Date: Thu, 15 Jul 2010 08:45:32 +0000 Subject: atm: Convert pci_table entries to PCI_VDEVICE (if PCI_ANY_ID is used) This patch converts pci_table entries, where .subvendor=PCI_ANY_ID and .subdevice=PCI_ANY_ID, .class=0 and .class_mask=0, to use the PCI_VDEVICE macro, and thus improves readability. Signed-off-by: Peter Huewe Signed-off-by: David S. Miller --- drivers/atm/idt77252.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'drivers/atm/idt77252.c') diff --git a/drivers/atm/idt77252.c b/drivers/atm/idt77252.c index 558ad186942..1679cbf0c58 100644 --- a/drivers/atm/idt77252.c +++ b/drivers/atm/idt77252.c @@ -3779,8 +3779,7 @@ err_out_disable_pdev: static struct pci_device_id idt77252_pci_tbl[] = { - { PCI_VENDOR_ID_IDT, PCI_DEVICE_ID_IDT_IDT77252, - PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, + { PCI_VDEVICE(IDT, PCI_DEVICE_ID_IDT_IDT77252), 0 }, { 0, } }; -- cgit v1.2.3