From patchwork Thu Sep 3 23:10:54 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dhananjay Phadke X-Patchwork-Id: 32919 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@bilbo.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from ozlabs.org (ozlabs.org [203.10.76.45]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mx.ozlabs.org", Issuer "CA Cert Signing Authority" (verified OK)) by bilbo.ozlabs.org (Postfix) with ESMTPS id A5A8FB70B0 for ; Fri, 4 Sep 2009 09:11:09 +1000 (EST) Received: by ozlabs.org (Postfix) id 965E3DDDA0; Fri, 4 Sep 2009 09:11:09 +1000 (EST) Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 2984FDDD1B for ; Fri, 4 Sep 2009 09:11:09 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932497AbZICXK6 (ORCPT ); Thu, 3 Sep 2009 19:10:58 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932472AbZICXK5 (ORCPT ); Thu, 3 Sep 2009 19:10:57 -0400 Received: from nat-1.pathscale.com ([198.186.3.73]:12131 "HELO unm84.unmin.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with SMTP id S932467AbZICXKz (ORCPT ); Thu, 3 Sep 2009 19:10:55 -0400 Received: by unm84.unmin.com (Postfix, from userid 720) id 336E1E8AFB; Thu, 3 Sep 2009 16:10:55 -0700 (PDT) From: Dhananjay Phadke To: davem@davemloft.com Cc: netdev@vger.kernel.org Subject: [PATCH NEXT 2/3] netxen: remove duplicate napi_add Date: Thu, 3 Sep 2009 16:10:54 -0700 Message-Id: <1252019455-30683-2-git-send-email-dhananjay@netxen.com> X-Mailer: git-send-email 1.6.0.2 In-Reply-To: <1252019455-30683-1-git-send-email-dhananjay@netxen.com> References: <1252019455-30683-1-git-send-email-dhananjay@netxen.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Remove duplicate calls to netxen_napi_add(). Signed-off-by: Dhananjay Phadke --- drivers/net/netxen/netxen_nic_main.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c index f824a39..53d57dc 100644 --- a/drivers/net/netxen/netxen_nic_main.c +++ b/drivers/net/netxen/netxen_nic_main.c @@ -1095,10 +1095,6 @@ netxen_setup_netdev(struct netxen_adapter *adapter, netdev->irq = adapter->msix_entries[0].vector; - err = netxen_napi_add(adapter, netdev); - if (err) - return err; - init_timer(&adapter->watchdog_timer); adapter->watchdog_timer.function = &netxen_watchdog; adapter->watchdog_timer.data = (unsigned long)adapter; @@ -2038,8 +2034,6 @@ netxen_remove_sysfs_entries(struct netxen_adapter *adapter) device_remove_file(dev, &dev_attr_bridged_mode); } -static void netxen_watchdog(unsigned long); - #ifdef CONFIG_INET #define is_netxen_netdev(dev) (dev->netdev_ops == &netxen_netdev_ops)