From patchwork Wed Oct 14 22:57:59 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicholas Krause X-Patchwork-Id: 530456 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id 9A1C6140E44 for ; Thu, 15 Oct 2015 12:16:19 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=y5iBMI1f; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id EB54187E2D; Thu, 15 Oct 2015 01:16:18 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id UQtJZWJyXAEN; Thu, 15 Oct 2015 01:16:17 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id A6710884C8; Thu, 15 Oct 2015 01:16:17 +0000 (UTC) X-Original-To: intel-wired-lan@lists.osuosl.org Delivered-To: intel-wired-lan@lists.osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 6D7F31C16DF for ; Wed, 14 Oct 2015 22:58:06 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 68D658839D for ; Wed, 14 Oct 2015 22:58:06 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 0cU+WiC8nDEU for ; Wed, 14 Oct 2015 22:58:06 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-qg0-f47.google.com (mail-qg0-f47.google.com [209.85.192.47]) by hemlock.osuosl.org (Postfix) with ESMTPS id E1EBE88395 for ; Wed, 14 Oct 2015 22:58:05 +0000 (UTC) Received: by qgez77 with SMTP id z77so57117442qge.1 for ; Wed, 14 Oct 2015 15:58:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ldeGeWXAFOFpkbZEgqvmili7oy2go0Iu9O6KZAv2XeA=; b=y5iBMI1fLLb7xMjrnLSp78wq6rEilt/i9eREFYbNxpji1NPYYXDdQFpkJ0xSk6G+wh ckVc2qj14cdJdmwlodHp03nqQ88Z5OJ4LsysyUuyLEtUdciriIvMUcMeKccF0mjG/q1V CqnZTPc4GkNLefrotLObGKljAiyrPNax4/JBoEL9z9cKjtFUUCwL5rYbfwOC5A2ELRah PNtLUgGF8Ntww6fOHlxZso3csYUBDwJUvqg90HHS2UbS7DtE7V+PxvAmPia5zfJbbuRJ 2COwRAZYrxKr87oFuSiuCAqGY8HdWpwKtZZQkFd/sqANaKF9vPocN1NE0lBYpc1iWGSS nY3Q== X-Received: by 10.140.202.204 with SMTP id x195mr7417882qha.7.1444863485202; Wed, 14 Oct 2015 15:58:05 -0700 (PDT) Received: from nick-System-Product-Name.hitronhub.home (CPEbc4dfb2691f3-CMbc4dfb2691f0.cpe.net.cable.rogers.com. [99.231.110.121]) by smtp.googlemail.com with ESMTPSA id x19sm4266601qkx.32.2015.10.14.15.58.04 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 14 Oct 2015 15:58:04 -0700 (PDT) From: Nicholas Krause To: jeffrey.t.kirsher@intel.com Date: Wed, 14 Oct 2015 18:57:59 -0400 Message-Id: <1444863479-31570-2-git-send-email-xerofoify@gmail.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1444863479-31570-1-git-send-email-xerofoify@gmail.com> References: <1444863479-31570-1-git-send-email-xerofoify@gmail.com> X-Mailman-Approved-At: Thu, 15 Oct 2015 01:16:16 +0000 Cc: linux-kernel@vger.kernel.org, intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org Subject: [Intel-wired-lan] [PATCH 2/2] ixgb:Make the function ixgb_sw_init void X-BeenThere: intel-wired-lan@lists.osuosl.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Intel Wired Ethernet Linux Kernel Driver Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-wired-lan-bounces@lists.osuosl.org Sender: "Intel-wired-lan" This makes the function ixgb_sw_init void now due to this function always running successfully and the unnessary error path in the function ixgb_probe being removed that checks and always gets the kernel value for success of zero when checking the return Signed-off-by: Nicholas Krause --- drivers/net/ethernet/intel/ixgb/ixgb_main.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/intel/ixgb/ixgb_main.c b/drivers/net/ethernet/intel/ixgb/ixgb_main.c index 4a90f36..fc15a09 100644 --- a/drivers/net/ethernet/intel/ixgb/ixgb_main.c +++ b/drivers/net/ethernet/intel/ixgb/ixgb_main.c @@ -74,7 +74,7 @@ static int ixgb_init_module(void); static void ixgb_exit_module(void); static int ixgb_probe(struct pci_dev *pdev, const struct pci_device_id *ent); static void ixgb_remove(struct pci_dev *pdev); -static int ixgb_sw_init(struct ixgb_adapter *adapter); +static void ixgb_sw_init(struct ixgb_adapter *adapter); static int ixgb_open(struct net_device *netdev); static int ixgb_close(struct net_device *netdev); static void ixgb_configure_tx(struct ixgb_adapter *adapter); @@ -577,7 +577,7 @@ ixgb_remove(struct pci_dev *pdev) * OS network device settings (MTU size). **/ -static int +static void ixgb_sw_init(struct ixgb_adapter *adapter) { struct ixgb_hw *hw = &adapter->hw; @@ -608,7 +608,6 @@ ixgb_sw_init(struct ixgb_adapter *adapter) hw->fc.send_xon = 1; set_bit(__IXGB_DOWN, &adapter->flags); - return 0; } /**