{"id":810436,"url":"http://patchwork.ozlabs.org/api/1.2/patches/810436/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/d0881adf53a3f0a546b3e7940b92b4ce938e7e50.1504684488.git.sbrivio@redhat.com/","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/1.2/projects/7/?format=json","name":"Linux network development","link_name":"netdev","list_id":"netdev.vger.kernel.org","list_email":"netdev@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null,"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":"awaiting-upstream","archived":true,"hash":"43715370d11d81ef9993f20a702f20dbef07a705","submitter":{"id":72032,"url":"http://patchwork.ozlabs.org/api/1.2/people/72032/?format=json","name":"Stefano Brivio","email":"sbrivio@redhat.com"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/1.2/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/d0881adf53a3f0a546b3e7940b92b4ce938e7e50.1504684488.git.sbrivio@redhat.com/mbox/","series":[{"id":1716,"url":"http://patchwork.ozlabs.org/api/1.2/series/1716/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=1716","date":"2017-09-06T08:11:37","name":"i40e: Two trivial fixes for 09f79fd49d94","version":1,"mbox":"http://patchwork.ozlabs.org/series/1716/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/810436/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/810436/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"patchwork-incoming@ozlabs.org","Delivered-To":"patchwork-incoming@ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netdev-owner@vger.kernel.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 vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xnGXK3drSz9sNd\n\tfor ;\n\tWed, 6 Sep 2017 18:12:17 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1752038AbdIFIMP (ORCPT );\n\tWed, 6 Sep 2017 04:12:15 -0400","from mx1.redhat.com ([209.132.183.28]:59632 \"EHLO mx1.redhat.com\"\n\trhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP\n\tid S1751938AbdIFIML (ORCPT );\n\tWed, 6 Sep 2017 04:12:11 -0400","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)"],"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","Cc":"\"David S . Miller\" ,\n\tAnjali Singhai Jain ","Subject":"[PATCH net 2/2] i40e: Avoid some useless variables and initializers\n\tin nvm functions","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","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.27]);\n\tWed, 06 Sep 2017 08:12:11 +0000 (UTC)","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"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"]}