{"id":810437,"url":"http://patchwork.ozlabs.org/api/patches/810437/?format=json","web_url":"http://patchwork.ozlabs.org/project/intel-wired-lan/patch/d0881adf53a3f0a546b3e7940b92b4ce938e7e50.1504684488.git.sbrivio@redhat.com/","project":{"id":46,"url":"http://patchwork.ozlabs.org/api/projects/46/?format=json","name":"Intel Wired Ethernet development","link_name":"intel-wired-lan","list_id":"intel-wired-lan.osuosl.org","list_email":"intel-wired-lan@osuosl.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"","list_archive_url":null,"date":"2017-09-06T08:11:39","name":"[net,2/2] i40e: Avoid some useless variables and initializers in nvm functions","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"43715370d11d81ef9993f20a702f20dbef07a705","submitter":{"id":72032,"url":"http://patchwork.ozlabs.org/api/people/72032/?format=json","name":"Stefano Brivio","email":"sbrivio@redhat.com"},"delegate":{"id":68,"url":"http://patchwork.ozlabs.org/api/users/68/?format=json","username":"jtkirshe","first_name":"Jeff","last_name":"Kirsher","email":"jeffrey.t.kirsher@intel.com"},"mbox":"http://patchwork.ozlabs.org/project/intel-wired-lan/patch/d0881adf53a3f0a546b3e7940b92b4ce938e7e50.1504684488.git.sbrivio@redhat.com/mbox/","series":[{"id":1717,"url":"http://patchwork.ozlabs.org/api/series/1717/?format=json","web_url":"http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=1717","date":"2017-09-06T08:11:37","name":"i40e: Two trivial fixes for 09f79fd49d94","version":1,"mbox":"http://patchwork.ozlabs.org/series/1717/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/810437/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/810437/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":["incoming@patchwork.ozlabs.org","intel-wired-lan@lists.osuosl.org"],"Delivered-To":["patchwork-incoming@bilbo.ozlabs.org","intel-wired-lan@lists.osuosl.org"],"Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=osuosl.org\n\t(client-ip=140.211.166.136; helo=silver.osuosl.org;\n\tenvelope-from=intel-wired-lan-bounces@osuosl.org;\n\treceiver=)","ext-mx03.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx03.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=sbrivio@redhat.com"],"Received":["from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xnGXL6v3rz9sNd\n\tfor ;\n\tWed, 6 Sep 2017 18:12:18 +1000 (AEST)","from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id 4735630AE3;\n\tWed, 6 Sep 2017 08:12:17 +0000 (UTC)","from silver.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id H4VmkjYWgdw4; Wed, 6 Sep 2017 08:12:15 +0000 (UTC)","from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby silver.osuosl.org (Postfix) with ESMTP id E2B0130AD3;\n\tWed, 6 Sep 2017 08:12:15 +0000 (UTC)","from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\tby ash.osuosl.org (Postfix) with ESMTP id 0DF471CE899\n\tfor ;\n\tWed, 6 Sep 2017 08:12:15 +0000 (UTC)","from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 0593B88613\n\tfor ;\n\tWed, 6 Sep 2017 08:12:15 +0000 (UTC)","from whitealder.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id RrVeYOxRsdUJ for ;\n\tWed, 6 Sep 2017 08:12:11 +0000 (UTC)","from mx1.redhat.com (mx1.redhat.com [209.132.183.28])\n\tby whitealder.osuosl.org (Postfix) with ESMTPS id 65A8587170\n\tfor ;\n\tWed, 6 Sep 2017 08:12:11 +0000 (UTC)","from smtp.corp.redhat.com\n\t(int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id CF09880F99;\n\tWed, 6 Sep 2017 08:12:10 +0000 (UTC)","from elisabeth.redhat.com (unknown [10.33.36.13])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 77D4F19CB9;\n\tWed, 6 Sep 2017 08:12:08 +0000 (UTC)"],"X-Virus-Scanned":["amavisd-new at osuosl.org","amavisd-new at osuosl.org"],"X-Greylist":["domain auto-whitelisted by SQLgrey-1.7.6","Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.27]); Wed, 06 Sep 2017 08:12:11 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com CF09880F99","From":"Stefano Brivio ","To":"Jeff Kirsher , netdev@vger.kernel.org,\n\tintel-wired-lan@lists.osuosl.org","Date":"Wed, 6 Sep 2017 10:11:39 +0200","Message-Id":"","In-Reply-To":"","References":"","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.11","Cc":"\"David S . Miller\" ","Subject":"[Intel-wired-lan] [PATCH net 2/2] i40e: Avoid some useless\n\tvariables and initializers in nvm functions","X-BeenThere":"intel-wired-lan@osuosl.org","X-Mailman-Version":"2.1.18-1","Precedence":"list","List-Id":"Intel Wired Ethernet Linux Kernel Driver Development\n\t","List-Unsubscribe":", \n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":", \n\t","MIME-Version":"1.0","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"intel-wired-lan-bounces@osuosl.org","Sender":"\"Intel-wired-lan\" "},"content":"Fixes: 09f79fd49d94 (\"i40e: avoid NVM acquire deadlock during NVM update\")\nSigned-off-by: Stefano Brivio \n---\n drivers/net/ethernet/intel/i40e/i40e_nvm.c | 20 +++++++-------------\n 1 file changed, 7 insertions(+), 13 deletions(-)","diff":"diff --git a/drivers/net/ethernet/intel/i40e/i40e_nvm.c b/drivers/net/ethernet/intel/i40e/i40e_nvm.c\nindex 200779d5c124..4a8a81cd3e32 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_nvm.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_nvm.c\n@@ -294,13 +294,10 @@ static i40e_status i40e_read_nvm_word_aq(struct i40e_hw *hw, u16 offset,\n static i40e_status __i40e_read_nvm_word(struct i40e_hw *hw,\n \t\t\t\t\tu16 offset, u16 *data)\n {\n-\ti40e_status ret_code = 0;\n-\n \tif (hw->flags & I40E_HW_FLAG_AQ_SRCTL_ACCESS_ENABLE)\n-\t\tret_code = i40e_read_nvm_word_aq(hw, offset, data);\n-\telse\n-\t\tret_code = i40e_read_nvm_word_srctl(hw, offset, data);\n-\treturn ret_code;\n+\t\treturn i40e_read_nvm_word_aq(hw, offset, data);\n+\n+\treturn i40e_read_nvm_word_srctl(hw, offset, data);\n }\n \n /**\n@@ -314,7 +311,7 @@ static i40e_status __i40e_read_nvm_word(struct i40e_hw *hw,\n i40e_status i40e_read_nvm_word(struct i40e_hw *hw, u16 offset,\n \t\t\t u16 *data)\n {\n-\ti40e_status ret_code = 0;\n+\ti40e_status ret_code;\n \n \tret_code = i40e_acquire_nvm(hw, I40E_RESOURCE_READ);\n \tif (ret_code)\n@@ -429,13 +426,10 @@ static i40e_status __i40e_read_nvm_buffer(struct i40e_hw *hw,\n \t\t\t\t\t u16 offset, u16 *words,\n \t\t\t\t\t u16 *data)\n {\n-\ti40e_status ret_code = 0;\n-\n \tif (hw->flags & I40E_HW_FLAG_AQ_SRCTL_ACCESS_ENABLE)\n-\t\tret_code = i40e_read_nvm_buffer_aq(hw, offset, words, data);\n-\telse\n-\t\tret_code = i40e_read_nvm_buffer_srctl(hw, offset, words, data);\n-\treturn ret_code;\n+\t\treturn i40e_read_nvm_buffer_aq(hw, offset, words, data);\n+\n+\treturn i40e_read_nvm_buffer_srctl(hw, offset, words, data);\n }\n \n /**\n","prefixes":["net","2/2"]}