From: Bruce Allan Date: Tue, 16 Apr 2019 17:24:26 +0000 (-0700) Subject: ice: Cleanup an unnecessary variable initialization X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=173e23c0cb52889c21bec8e778241c429d13f310;p=openwrt%2Fstaging%2Fblogic.git ice: Cleanup an unnecessary variable initialization Commit 3463688e6ced ("ice: Add more validation in ice_vc_cfg_irq_map_msg") added an assignment of vsi making the assignment during declaration unnecessary. Also, cleanup the declaration and assignment of irqmap_info to not use two lines in the variable declaration section. Signed-off-by: Bruce Allan Signed-off-by: Anirudh Venkataramanan Tested-by: Andrew Bowers Signed-off-by: Jeff Kirsher --- diff --git a/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c b/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c index a805cbdd69be..693f5d09326a 100644 --- a/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c +++ b/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c @@ -1807,16 +1807,16 @@ error_param: static int ice_vc_cfg_irq_map_msg(struct ice_vf *vf, u8 *msg) { enum virtchnl_status_code v_ret = VIRTCHNL_STATUS_SUCCESS; - struct virtchnl_irq_map_info *irqmap_info = - (struct virtchnl_irq_map_info *)msg; + struct virtchnl_irq_map_info *irqmap_info; u16 vsi_id, vsi_q_id, vector_id; struct virtchnl_vector_map *map; - struct ice_vsi *vsi = NULL; struct ice_pf *pf = vf->pf; + struct ice_vsi *vsi; unsigned long qmap; u16 num_q_vectors; int i; + irqmap_info = (struct virtchnl_irq_map_info *)msg; num_q_vectors = irqmap_info->num_vectors - ICE_NONQ_VECS_VF; vsi = pf->vsi[vf->lan_vsi_idx];