From patchwork Thu Aug 25 15:02:49 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Francois Romieu X-Patchwork-Id: 111592 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 3C8B8B6F80 for ; Fri, 26 Aug 2011 01:21:09 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754405Ab1HYPU6 (ORCPT ); Thu, 25 Aug 2011 11:20:58 -0400 Received: from violet.fr.zoreil.com ([92.243.8.30]:38077 "EHLO violet.fr.zoreil.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753912Ab1HYPUt (ORCPT ); Thu, 25 Aug 2011 11:20:49 -0400 Received: from violet.fr.zoreil.com (localhost [127.0.0.1]) by violet.fr.zoreil.com (8.13.8/8.13.8) with ESMTP id p7PF2oCj021904; Thu, 25 Aug 2011 17:02:50 +0200 Received: (from romieu@localhost) by violet.fr.zoreil.com (8.13.8/8.13.8/Submit) id p7PF2nvc021903; Thu, 25 Aug 2011 17:02:49 +0200 Date: Thu, 25 Aug 2011 17:02:49 +0200 From: Francois Romieu To: Thomas Jarosch Cc: netdev@vger.kernel.org, "David S. Miller" Subject: [PATCH] cassini: init before use in cas_interruptN. Message-ID: <20110825150249.GA21897@electric-eye.fr.zoreil.com> References: <201108251558.45290.thomas.jarosch@intra2net.com> Mime-Version: 1.0 Content-Disposition: inline In-Reply-To: <201108251558.45290.thomas.jarosch@intra2net.com> User-Agent: Mutt/1.4.2.2i X-Organisation: Land of Sunshine Inc. Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Francois Romieu Spotted-by: Thomas Jarosch --- David, any opinion regarding the removal of the USE_NAPI #ifdef in this driver ? drivers/net/cassini.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/drivers/net/cassini.c b/drivers/net/cassini.c index 646c86b..fdb7a17 100644 --- a/drivers/net/cassini.c +++ b/drivers/net/cassini.c @@ -2452,14 +2452,13 @@ static irqreturn_t cas_interruptN(int irq, void *dev_id) struct net_device *dev = dev_id; struct cas *cp = netdev_priv(dev); unsigned long flags; - int ring; + int ring = (irq == cp->pci_irq_INTC) ? 2 : 3; u32 status = readl(cp->regs + REG_PLUS_INTRN_STATUS(ring)); /* check for shared irq */ if (status == 0) return IRQ_NONE; - ring = (irq == cp->pci_irq_INTC) ? 2 : 3; spin_lock_irqsave(&cp->lock, flags); if (status & INTR_RX_DONE_ALT) { /* handle rx separately */ #ifdef USE_NAPI