From patchwork Sat Oct 22 09:56:43 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yong Zhang X-Patchwork-Id: 121169 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 78C6C1007D3 for ; Sat, 22 Oct 2011 21:11:55 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754373Ab1JVKLk (ORCPT ); Sat, 22 Oct 2011 06:11:40 -0400 Received: from mail-iy0-f174.google.com ([209.85.210.174]:57970 "EHLO mail-iy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751577Ab1JVKLi (ORCPT ); Sat, 22 Oct 2011 06:11:38 -0400 Received: by mail-iy0-f174.google.com with SMTP id k3so5739018iae.19 for ; Sat, 22 Oct 2011 03:11:38 -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=y1umorAgfJ77fr2NqMr0fMWt27h8zjtedz+N+RXDBqg=; b=db64Q0Bq3IVhNIuuekSgfAOEE5b4kIH3gUymW2wSW0Xcv7fbmj7z7gatY39jMay6GL Cr4vQG64mlzsULfcKFRVLbq7poqrfLebMH5JC8r3DtsFP052+nuje9wzNqLzN3CrMYrG 5E3lZ0JLC6izKSHykwwsM97co0bPF41sBNDWo= Received: by 10.43.50.201 with SMTP id vf9mr24331898icb.10.1319278298671; Sat, 22 Oct 2011 03:11:38 -0700 (PDT) Received: from localhost ([118.186.129.169]) by mx.google.com with ESMTPS id l28sm41525173ibc.3.2011.10.22.03.11.26 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 22 Oct 2011 03:11:37 -0700 (PDT) From: Yong Zhang To: linux-kernel@vger.kernel.org Cc: tglx@linutronix.de, Armin Schindler , Karsten Keil , netdev@vger.kernel.org Subject: [PATCH 31/49] ISDN: irq: Remove IRQF_DISABLED Date: Sat, 22 Oct 2011 17:56:43 +0800 Message-Id: <1319277421-9203-32-git-send-email-yong.zhang0@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1319277421-9203-1-git-send-email-yong.zhang0@gmail.com> References: <1319277421-9203-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);