From patchwork Thu Sep 22 08:59:01 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yong Zhang X-Patchwork-Id: 115913 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 88F9CB6F84 for ; Thu, 22 Sep 2011 19:05:25 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753133Ab1IVJEv (ORCPT ); Thu, 22 Sep 2011 05:04:51 -0400 Received: from mail-ww0-f44.google.com ([74.125.82.44]:38518 "EHLO mail-ww0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753106Ab1IVJEo (ORCPT ); Thu, 22 Sep 2011 05:04:44 -0400 Received: by mail-ww0-f44.google.com with SMTP id 22so1886027wwf.1 for ; Thu, 22 Sep 2011 02:04:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=FEnre9OJHstc8s396uzIkfxmvS36LP0Fuo72lmKEIPE=; b=E1z7W0HmbWYjowQscXaS43kj5ZY8mLcjWcj5AVfnwBMWfw2H+eLm2M5NBIcPWSoY2r cuTOSJe6mIXi9bcxllhxROS9NORUYBMpYQfuOccyczBFfvI0aqARY/whvbLLEEhxzZ5C pqi1b7zn/oYfIGHsoeBbamRKqRkbH2YzHnmC0= Received: by 10.216.133.69 with SMTP id p47mr1939052wei.53.1316682283800; Thu, 22 Sep 2011 02:04:43 -0700 (PDT) Received: from localhost ([61.148.56.138]) by mx.google.com with ESMTPS id l18sm6836839wbo.23.2011.09.22.02.04.42 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 22 Sep 2011 02:04:43 -0700 (PDT) From: Yong Zhang To: linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org Cc: tglx@linutronix.de, yong.zhang0@gmail.com, Armin Schindler , Karsten Keil , netdev@vger.kernel.org Subject: [PATCH 34/55] ISDN: irq: Remove IRQF_DISABLED Date: Thu, 22 Sep 2011 16:59:01 +0800 Message-Id: <1316681962-8217-35-git-send-email-yong.zhang0@gmail.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1316681962-8217-1-git-send-email-yong.zhang0@gmail.com> References: <1316681962-8217-1-git-send-email-yong.zhang0@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Since commit [e58aa3d2: genirq: Run irq handlers with interrupts disabled], We run all interrupt handlers with interrupts disabled and we even check and yell when an interrupt handler returns with interrupts enabled (see commit [b738a50a: genirq: Warn when handler enables interrupts]). So now this flag is a NOOP and can be removed. Signed-off-by: Yong Zhang --- drivers/isdn/hardware/eicon/divasmain.c | 2 +- drivers/isdn/sc/init.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/isdn/hardware/eicon/divasmain.c b/drivers/isdn/hardware/eicon/divasmain.c index f332b60..8a0a831 100644 --- a/drivers/isdn/hardware/eicon/divasmain.c +++ b/drivers/isdn/hardware/eicon/divasmain.c @@ -481,7 +481,7 @@ void __inline__ outpp(void __iomem *addr, word p) int diva_os_register_irq(void *context, byte irq, const char *name) { int result = request_irq(irq, diva_os_irq_wrapper, - IRQF_DISABLED | IRQF_SHARED, name, context); + IRQF_SHARED, name, context); return (result); } diff --git a/drivers/isdn/sc/init.c b/drivers/isdn/sc/init.c index ca710ab..a3127fb 100644 --- a/drivers/isdn/sc/init.c +++ b/drivers/isdn/sc/init.c @@ -336,7 +336,7 @@ static int __init sc_init(void) */ sc_adapter[cinst]->interrupt = irq[b]; if (request_irq(sc_adapter[cinst]->interrupt, interrupt_handler, - IRQF_DISABLED, interface->id, + 0, interface->id, (void *)(unsigned long) cinst)) { kfree(sc_adapter[cinst]->channel);