From patchwork Wed Oct 14 22:57:58 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicholas Krause X-Patchwork-Id: 530455 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 1A2501401F0 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=Z4SAXhgF; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 6AC69885AA; 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 GCmIp-H9_vth; 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 812E287E2D; 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 735591C16DF for ; Wed, 14 Oct 2015 22:58:05 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 6B1B888395 for ; Wed, 14 Oct 2015 22:58:05 +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 QF8-5+3IjxJb for ; Wed, 14 Oct 2015 22:58:04 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-qg0-f44.google.com (mail-qg0-f44.google.com [209.85.192.44]) by hemlock.osuosl.org (Postfix) with ESMTPS id C5BDA88399 for ; Wed, 14 Oct 2015 22:58:04 +0000 (UTC) Received: by qgx61 with SMTP id 61so56933160qgx.3 for ; Wed, 14 Oct 2015 15:58:04 -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; bh=SPlheVxu4/GVfGL1rdUoBm1mWplyY4veE9iwuK750Sc=; b=Z4SAXhgFtz8eImnJ4tqO/djWDHc0QvE7SdHlSWREfp7+2sukxF7V1tQU86Ohd9WAv5 LiSPgDkdezCsRqkIdhpmh7xmgixdKt50FKdmqLCOYtHhPkNQQ0tXxUv4z/nGMBPERBtL +WTAE4yhmTzMdtJGQZ/j05146mWWArbzzJ6t6TnYRkmuVOwnxk4xEDSdxlovSdwqqr1A WL7FXoTo6SFY4Rx0IL/Ca/GLUZMrl+6odUeG4A+CDGOawYL3+lQJD9gssAqrMBsl6Vhw HJC+b+TpGi9AGJKuKeZeObqSZyesYse2l3s3B+69+d3aMOzl1rX8elwHaKnayfaKNvtd ZvSA== X-Received: by 10.140.233.80 with SMTP id e77mr7820846qhc.27.1444863483990; Wed, 14 Oct 2015 15:58:03 -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.02 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 14 Oct 2015 15:58:03 -0700 (PDT) From: Nicholas Krause To: jeffrey.t.kirsher@intel.com Date: Wed, 14 Oct 2015 18:57:58 -0400 Message-Id: <1444863479-31570-1-git-send-email-xerofoify@gmail.com> X-Mailer: git-send-email 2.1.4 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 RESEND 1/2] ixgb:Remove reducant error path after call to ixgb_sw_init in the function ixgb_probe 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 removes the reducant error path and now no longer used goto label err_sw_init after the call to ixgb_probe in the function ixgb_sw_init after calling this function due to it always returning zero as it is guarantee to run successfully without any issues. Signed-off-by: Nicholas Krause --- drivers/net/ethernet/intel/ixgb/ixgb_main.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/net/ethernet/intel/ixgb/ixgb_main.c b/drivers/net/ethernet/intel/ixgb/ixgb_main.c index 31f9145..4a90f36 100644 --- a/drivers/net/ethernet/intel/ixgb/ixgb_main.c +++ b/drivers/net/ethernet/intel/ixgb/ixgb_main.c @@ -469,9 +469,7 @@ ixgb_probe(struct pci_dev *pdev, const struct pci_device_id *ent) /* setup the private structure */ - err = ixgb_sw_init(adapter); - if (err) - goto err_sw_init; + ixgb_sw_init(adapter); netdev->hw_features = NETIF_F_SG | NETIF_F_TSO | @@ -531,7 +529,6 @@ ixgb_probe(struct pci_dev *pdev, const struct pci_device_id *ent) return 0; err_register: -err_sw_init: err_eeprom: iounmap(adapter->hw.hw_addr); err_ioremap: