From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751960AbcAAOdH (ORCPT ); Fri, 1 Jan 2016 09:33:07 -0500 Received: from mout.web.de ([212.227.15.4]:56008 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751372AbcAAOdC (ORCPT ); Fri, 1 Jan 2016 09:33:02 -0500 Subject: [PATCH] net-i40e: Replace variable initialisations by assignments in i40e_vc_get_vf_resources_msg() References: <566ABCD9.1060404@users.sourceforge.net> Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall To: netdev@vger.kernel.org, intel-wired-lan@lists.osuosl.org, Bruce Allan , Carolyn Wyborny , Don Skidmore , Jeff Kirsher , Jesse Brandeburg , John Ronciak , Mitch Williams , Shannon Nelson From: SF Markus Elfring X-Enigmail-Draft-Status: N1110 Message-ID: <56868E0B.5040602@users.sourceforge.net> Date: Fri, 1 Jan 2016 15:32:43 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.4.0 MIME-Version: 1.0 In-Reply-To: <566ABCD9.1060404@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:sRnb73rLLPPQ5ugSPhAzXNyN62wmHQHQSIHUBhp2pDF1aNJrlq2 vDnrxbB3zuTY9dl1v+1b7KH3LT/WcuFFnYWSOPLrZGvZcf024jCpwlBd4OMORpwp3wZfS1D mymGp4JPevAVXCyQs2c8enP8PWJ0Ot2jH7QfQGOUrVV5wGOfGwjvRFVWqW7kpBvnN5pddvM D/MniI/qZjiXLUpaGRB+w== X-UI-Out-Filterresults: notjunk:1;V01:K0:LDQjpTV1McE=:8PhLQdNMocBavFK+nUrOOH W02M/LZjCWKF5I3PchNnRP+PLVG/S+ACeDAiVJ7/nobf/Ze40YUBy/M0eCb0bhuxypk1Mdt/v /WbtfCzgKQaj52i/wA/xp2e/5lCCT5MPwrtFfrRwzeItqixAZsLvwfnIwzTKrWdz3hxemdhrb gynjdD5xxek3rNDp0uLfBoRCdfkfUskS2Dwx/ho0GDGBeq2TPPxoIbPvf51AzSaZPR8nJzTHc gKkWw/XlEuaJcn77UmKQgaeSsAbq2QjD1XivQmGZB32t+WxGqRT4VFe2mIEfAtUkBTaA/SuqU BZXqs2vTf382HxB1/cDeOH0t266wYe3iJIqdY2hsg56JG09hf+CD8ufhb9JvVHr7Qtt9VGlCP 1UpqNEofW8tADNSxDmoQE9njONqRrbT9xb4EoMVLkXQP9O+MoX6h19AHWN4yhfPqE3MSrIFAx 9qsK74jZS0zjrMo2uxlnom1sHU0OLvZLbYAXaYAZZVLTTuHEiMkLVi2zlwfZgu6wdXTZ/Wr+n KNCY3iHUa2URPaQwCITM1Ue7qN7zhhz/jUUYtHA8JsGj5SkExPystMUfor5DZin1Ya/9u184r PsucaDh1kssvDGXLUk1RUcQq960Sc13YQMq42usWJqMaoiywOBvmpwE8XoKNhFAn73+oL0dTL E6xbVd6LKDgjye7sfdGO6Y9gev3mrG2/EMl5T9qZV9NsdqNnbCd7qKbKrAMwFTXpBs4e/fbfJ OoVT33Ucjg7BYW8CuzNy96wiaPfGV3iiRq0kDDQ+A0sxFF9jxVZQDOOvbPiFN8xC9mEgyHva4 AO6mUXa Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Fri, 1 Jan 2016 15:11:09 +0100 Replace explicit initialisations for four local variables at the beginning by assignments that will only be performed if the corresponding code will really be executed. Signed-off-by: Markus Elfring --- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c index aa58a49..e0874f5 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c +++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c @@ -1172,16 +1172,18 @@ static int i40e_vc_get_version_msg(struct i40e_vf *vf, u8 *msg) **/ static int i40e_vc_get_vf_resources_msg(struct i40e_vf *vf, u8 *msg) { - struct i40e_virtchnl_vf_resource *vfres = NULL; - struct i40e_pf *pf = vf->pf; - i40e_status aq_ret = 0; + struct i40e_virtchnl_vf_resource *vfres; + struct i40e_pf *pf; + i40e_status aq_ret; struct i40e_vsi *vsi; - int i = 0, len = 0; + int i = 0; int num_vsis = 1; - int ret; + int len, ret; if (!test_bit(I40E_VF_STAT_INIT, &vf->vf_states)) { aq_ret = I40E_ERR_PARAM; + vfres = NULL; + len = 0; goto err; } @@ -1202,6 +1204,7 @@ static int i40e_vc_get_vf_resources_msg(struct i40e_vf *vf, u8 *msg) I40E_VIRTCHNL_VF_OFFLOAD_VLAN; vfres->vf_offload_flags = I40E_VIRTCHNL_VF_OFFLOAD_L2; + pf = vf->pf; vsi = pf->vsi[vf->lan_vsi_idx]; if (!vsi->info.pvid) vfres->vf_offload_flags |= I40E_VIRTCHNL_VF_OFFLOAD_VLAN; @@ -1231,7 +1234,7 @@ static int i40e_vc_get_vf_resources_msg(struct i40e_vf *vf, u8 *msg) i++; } set_bit(I40E_VF_STAT_ACTIVE, &vf->vf_states); - + aq_ret = 0; err: /* send the response back to the VF */ ret = i40e_vc_send_msg_to_vf(vf, I40E_VIRTCHNL_OP_GET_VF_RESOURCES, -- 2.6.3