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 <bruce.w.allan@intel.com>
Signed-off-by: Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

diff --git a/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c b/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c
index a805cbdd69be16aa1d96b8008de4f4a3ec9836f8..693f5d09326a5d535c24bc654c2e461ba8ff1ece 100644 (file)
--- 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];