From patchwork Sat Jul 10 13:42:02 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: chas williams - CONTRACTOR X-Patchwork-Id: 58482 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 5551EB6F06 for ; Sat, 10 Jul 2010 23:42:35 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755101Ab0GJNma (ORCPT ); Sat, 10 Jul 2010 09:42:30 -0400 Received: from hedwig.cmf.nrl.navy.mil ([134.207.12.162]:48319 "EHLO hedwig.cmf.nrl.navy.mil" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754791Ab0GJNm3 (ORCPT ); Sat, 10 Jul 2010 09:42:29 -0400 Received: from cmf.nrl.navy.mil (thirdoffive.cmf.nrl.navy.mil [134.207.12.180]) by hedwig.cmf.nrl.navy.mil (8.14.2/8.14.2) with ESMTP id o6ADg278014330 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT) for ; Sat, 10 Jul 2010 09:42:03 -0400 Received: from thirdoffive.cmf.nrl.navy.mil (chas@localhost) by cmf.nrl.navy.mil (8.14.3/8.14.3/Submit) with ESMTP id o6ADg2wx019157 for ; Sat, 10 Jul 2010 09:42:02 -0400 Message-Id: <201007101342.o6ADg2wx019157@cmf.nrl.navy.mil> To: netdev@vger.kernel.org Subject: [PATCH net-next-2.6][atm]: remove IRQF_DISABLED in combination with IRQF_SHARED Date: Sat, 10 Jul 2010 09:42:02 -0400 From: "chas williams - CONTRACTOR" X-NRLCMF-Spam-Score: () hits=-0.001 X-NRLCMF-Virus-Scanned: No virus found X-Scanned-By: MIMEDefang 2.64 on 134.207.12.162 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: chas williams - CONTRACTOR commit 2fae0433cf7febc4b69ff58730de1ca412846743 Author: chas williams - CONTRACTOR Date: Sat Jul 10 09:38:05 2010 -0400 [atm]: remove IRQF_DISABLED in combination with IRQF_SHARED Signed-off-by: Chas Williams - CONTRACTOR --- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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);