struct ice_sched_node *parent;
        struct ice_hw *hw;
        u16 i, buf_size;
-       int status;
        int ret;
 
        if (!pi || pi->port_state != ICE_SCHED_PORT_STATE_READY)
        node.data.elem_type = ICE_AQC_ELEM_TYPE_LEAF;
        for (i = 0; i < num_qsets; i++) {
                node.node_teid = buf->rdma_qsets[i].qset_teid;
-               status = ice_sched_add_node(pi, hw->num_tx_sched_layers - 1,
-                                           &node);
-               if (status) {
-                       ret = status;
+               ret = ice_sched_add_node(pi, hw->num_tx_sched_layers - 1,
+                                        &node);
+               if (ret)
                        break;
-               }
                qset_teid[i] = le32_to_cpu(node.node_teid);
        }
 rdma_error_exit:
 
        struct device *dev = ice_pf_to_dev(pf);
        struct ice_hw *hw = &pf->hw;
        struct ice_info_ctx *ctx;
-       int status;
        size_t i;
        int err;
 
                return -ENOMEM;
 
        /* discover capabilities first */
-       status = ice_discover_dev_caps(hw, &ctx->dev_caps);
-       if (status) {
+       err = ice_discover_dev_caps(hw, &ctx->dev_caps);
+       if (err) {
                dev_dbg(dev, "Failed to discover device capabilities, status %d aq_err %s\n",
-                       status, ice_aq_str(hw->adminq.sq_last_status));
+                       err, ice_aq_str(hw->adminq.sq_last_status));
                NL_SET_ERR_MSG_MOD(extack, "Unable to discover device capabilities");
                err = -EIO;
                goto out_free_ctx;
        }
 
        if (ctx->dev_caps.common_cap.nvm_update_pending_orom) {
-               status = ice_get_inactive_orom_ver(hw, &ctx->pending_orom);
-               if (status) {
+               err = ice_get_inactive_orom_ver(hw, &ctx->pending_orom);
+               if (err) {
                        dev_dbg(dev, "Unable to read inactive Option ROM version data, status %d aq_err %s\n",
-                               status, ice_aq_str(hw->adminq.sq_last_status));
+                               err, ice_aq_str(hw->adminq.sq_last_status));
 
                        /* disable display of pending Option ROM */
                        ctx->dev_caps.common_cap.nvm_update_pending_orom = false;
        }
 
        if (ctx->dev_caps.common_cap.nvm_update_pending_nvm) {
-               status = ice_get_inactive_nvm_ver(hw, &ctx->pending_nvm);
-               if (status) {
+               err = ice_get_inactive_nvm_ver(hw, &ctx->pending_nvm);
+               if (err) {
                        dev_dbg(dev, "Unable to read inactive NVM version data, status %d aq_err %s\n",
-                               status, ice_aq_str(hw->adminq.sq_last_status));
+                               err, ice_aq_str(hw->adminq.sq_last_status));
 
                        /* disable display of pending Option ROM */
                        ctx->dev_caps.common_cap.nvm_update_pending_nvm = false;
        }
 
        if (ctx->dev_caps.common_cap.nvm_update_pending_netlist) {
-               status = ice_get_inactive_netlist_ver(hw, &ctx->pending_netlist);
-               if (status) {
+               err = ice_get_inactive_netlist_ver(hw, &ctx->pending_netlist);
+               if (err) {
                        dev_dbg(dev, "Unable to read inactive Netlist version data, status %d aq_err %s\n",
-                               status, ice_aq_str(hw->adminq.sq_last_status));
+                               err, ice_aq_str(hw->adminq.sq_last_status));
 
                        /* disable display of pending Option ROM */
                        ctx->dev_caps.common_cap.nvm_update_pending_netlist = false;
 
        struct ice_pf *pf = vsi->back;
        struct ice_hw *hw = &pf->hw;
        struct device *dev;
-       int ret = 0;
-       int status;
+       int ret;
        u8 *buf;
 
        dev = ice_pf_to_dev(pf);
        if (!buf)
                return -ENOMEM;
 
-       status = ice_acquire_nvm(hw, ICE_RES_READ);
-       if (status) {
+       ret = ice_acquire_nvm(hw, ICE_RES_READ);
+       if (ret) {
                dev_err(dev, "ice_acquire_nvm failed, err %d aq_err %s\n",
-                       status, ice_aq_str(hw->adminq.sq_last_status));
+                       ret, ice_aq_str(hw->adminq.sq_last_status));
                ret = -EIO;
                goto out;
        }
 
-       status = ice_read_flat_nvm(hw, eeprom->offset, &eeprom->len, buf,
-                                  false);
-       if (status) {
+       ret = ice_read_flat_nvm(hw, eeprom->offset, &eeprom->len, buf,
+                               false);
+       if (ret) {
                dev_err(dev, "ice_read_flat_nvm failed, err %d aq_err %s\n",
-                       status, ice_aq_str(hw->adminq.sq_last_status));
+                       ret, ice_aq_str(hw->adminq.sq_last_status));
                ret = -EIO;
                goto release;
        }
        struct ice_link_status *link_info;
        struct ice_vsi *vsi = np->vsi;
        struct ice_port_info *pi;
-       int err = 0;
-       int status;
+       int err;
 
        pi = vsi->port_info;
 
        if (!caps)
                return -ENOMEM;
 
-       status = ice_aq_get_phy_caps(pi, false, ICE_AQC_REPORT_TOPO_CAP_MEDIA,
-                                    caps, NULL);
-       if (status) {
+       err = ice_aq_get_phy_caps(pi, false, ICE_AQC_REPORT_TOPO_CAP_MEDIA,
+                                 caps, NULL);
+       if (err) {
                err = -EAGAIN;
                goto done;
        }
        struct ice_aqc_get_phy_caps_data *caps;
        struct ice_link_status *hw_link_info;
        struct ice_vsi *vsi = np->vsi;
-       int err = 0;
-       int status;
+       int err;
 
        ethtool_link_ksettings_zero_link_mode(ks, supported);
        ethtool_link_ksettings_zero_link_mode(ks, advertising);
        if (!caps)
                return -ENOMEM;
 
-       status = ice_aq_get_phy_caps(vsi->port_info, false,
-                                    ICE_AQC_REPORT_ACTIVE_CFG, caps, NULL);
-       if (status) {
+       err = ice_aq_get_phy_caps(vsi->port_info, false,
+                                 ICE_AQC_REPORT_ACTIVE_CFG, caps, NULL);
+       if (err) {
                err = -EIO;
                goto done;
        }
            caps->link_fec_options & ICE_AQC_PHY_FEC_25G_RS_544_REQ)
                ethtool_link_ksettings_add_link_mode(ks, advertising, FEC_RS);
 
-       status = ice_aq_get_phy_caps(vsi->port_info, false,
-                                    ICE_AQC_REPORT_TOPO_CAP_MEDIA, caps, NULL);
-       if (status) {
+       err = ice_aq_get_phy_caps(vsi->port_info, false,
+                                 ICE_AQC_REPORT_TOPO_CAP_MEDIA, caps, NULL);
+       if (err) {
                err = -EIO;
                goto done;
        }
        u8 autoneg_changed = 0;
        u64 phy_type_high = 0;
        u64 phy_type_low = 0;
-       int err = 0;
        bool linkup;
-       int status;
+       int err;
 
        pi = np->vsi->port_info;
 
 
        /* Get the PHY capabilities based on media */
        if (ice_fw_supports_report_dflt_cfg(pi->hw))
-               status = ice_aq_get_phy_caps(pi, false, ICE_AQC_REPORT_DFLT_CFG,
-                                            phy_caps, NULL);
+               err = ice_aq_get_phy_caps(pi, false, ICE_AQC_REPORT_DFLT_CFG,
+                                         phy_caps, NULL);
        else
-               status = ice_aq_get_phy_caps(pi, false, ICE_AQC_REPORT_TOPO_CAP_MEDIA,
-                                            phy_caps, NULL);
-       if (status) {
+               err = ice_aq_get_phy_caps(pi, false, ICE_AQC_REPORT_TOPO_CAP_MEDIA,
+                                         phy_caps, NULL);
+       if (err) {
                err = -EIO;
                goto done;
        }
 
        /* Call to get the current link speed */
        pi->phy.get_link_info = true;
-       status = ice_get_link_status(pi, &linkup);
-       if (status) {
+       err = ice_get_link_status(pi, &linkup);
+       if (err) {
                err = -EIO;
                goto done;
        }
        }
 
        /* make the aq call */
-       status = ice_aq_set_phy_cfg(&pf->hw, pi, &config, NULL);
-       if (status) {
+       err = ice_aq_set_phy_cfg(&pf->hw, pi, &config, NULL);
+       if (err) {
                netdev_info(netdev, "Set phy config failed,\n");
                err = -EIO;
                goto done;
        struct ice_port_info *pi;
        u8 aq_failures;
        bool link_up;
-       int err = 0;
-       int status;
        u32 is_an;
+       int err;
 
        pi = vsi->port_info;
        hw_link_info = &pi->phy.link_info;
                return -ENOMEM;
 
        /* Get current PHY config */
-       status = ice_aq_get_phy_caps(pi, false, ICE_AQC_REPORT_ACTIVE_CFG, pcaps,
-                                    NULL);
-       if (status) {
+       err = ice_aq_get_phy_caps(pi, false, ICE_AQC_REPORT_ACTIVE_CFG, pcaps,
+                                 NULL);
+       if (err) {
                kfree(pcaps);
                return -EIO;
        }
                return -EINVAL;
 
        /* Set the FC mode and only restart AN if link is up */
-       status = ice_set_fc(pi, &aq_failures, link_up);
+       err = ice_set_fc(pi, &aq_failures, link_up);
 
        if (aq_failures & ICE_SET_FC_AQ_FAIL_GET) {
                netdev_info(netdev, "Set fc failed on the get_phy_capabilities call with err %d aq_err %s\n",
-                           status, ice_aq_str(hw->adminq.sq_last_status));
+                           err, ice_aq_str(hw->adminq.sq_last_status));
                err = -EAGAIN;
        } else if (aq_failures & ICE_SET_FC_AQ_FAIL_SET) {
                netdev_info(netdev, "Set fc failed on the set_phy_config call with err %d aq_err %s\n",
-                           status, ice_aq_str(hw->adminq.sq_last_status));
+                           err, ice_aq_str(hw->adminq.sq_last_status));
                err = -EAGAIN;
        } else if (aq_failures & ICE_SET_FC_AQ_FAIL_UPDATE) {
                netdev_info(netdev, "Set fc failed on the get_link_info call with err %d aq_err %s\n",
-                           status, ice_aq_str(hw->adminq.sq_last_status));
+                           err, ice_aq_str(hw->adminq.sq_last_status));
                err = -EAGAIN;
        }
 
 
        u64 entry1_h = 0;
        u64 entry2_h = 0;
        u64 prof_id;
-       int status;
        int err;
 
        main_vsi = ice_get_main_vsi(pf);
         * actions (NULL) and zero actions 0.
         */
        prof_id = flow + tun * ICE_FLTR_PTYPE_MAX;
-       status = ice_flow_add_prof(hw, ICE_BLK_FD, ICE_FLOW_RX, prof_id, seg,
-                                  TNL_SEG_CNT(tun), &prof);
-       if (status)
-               return status;
-       status = ice_flow_add_entry(hw, ICE_BLK_FD, prof_id, main_vsi->idx,
-                                   main_vsi->idx, ICE_FLOW_PRIO_NORMAL,
-                                   seg, &entry1_h);
-       if (status) {
-               err = status;
+       err = ice_flow_add_prof(hw, ICE_BLK_FD, ICE_FLOW_RX, prof_id, seg,
+                               TNL_SEG_CNT(tun), &prof);
+       if (err)
+               return err;
+       err = ice_flow_add_entry(hw, ICE_BLK_FD, prof_id, main_vsi->idx,
+                                main_vsi->idx, ICE_FLOW_PRIO_NORMAL,
+                                seg, &entry1_h);
+       if (err)
                goto err_prof;
-       }
-       status = ice_flow_add_entry(hw, ICE_BLK_FD, prof_id, main_vsi->idx,
-                                   ctrl_vsi->idx, ICE_FLOW_PRIO_NORMAL,
-                                   seg, &entry2_h);
-       if (status) {
-               err = status;
+       err = ice_flow_add_entry(hw, ICE_BLK_FD, prof_id, main_vsi->idx,
+                                ctrl_vsi->idx, ICE_FLOW_PRIO_NORMAL,
+                                seg, &entry2_h);
+       if (err)
                goto err_entry;
-       }
 
        hw_prof->fdir_seg[tun] = seg;
        hw_prof->entry_h[0][tun] = entry1_h;
        struct ice_vsi *ctrl_vsi;
        u8 *pkt, *frag_pkt;
        bool has_frag;
-       int status;
        int err;
 
        ctrl_vsi = ice_get_ctrl_vsi(pf);
        }
 
        ice_fdir_get_prgm_desc(hw, input, &desc, add);
-       status = ice_fdir_get_gen_prgm_pkt(hw, input, pkt, false, is_tun);
-       if (status) {
-               err = status;
+       err = ice_fdir_get_gen_prgm_pkt(hw, input, pkt, false, is_tun);
+       if (err)
                goto err_free_all;
-       }
        err = ice_prgm_fdir_fltr(ctrl_vsi, &desc, pkt);
        if (err)
                goto err_free_all;
        if (has_frag) {
                /* does not return error */
                ice_fdir_get_prgm_desc(hw, input, &desc, add);
-               status = ice_fdir_get_gen_prgm_pkt(hw, input, frag_pkt, true,
-                                                  is_tun);
-               if (status) {
-                       err = status;
+               err = ice_fdir_get_gen_prgm_pkt(hw, input, frag_pkt, true,
+                                               is_tun);
+               if (err)
                        goto err_frag;
-               }
                err = ice_prgm_fdir_fltr(ctrl_vsi, &desc, frag_pkt);
                if (err)
                        goto err_frag;
 
        struct ice_rq_event_info event;
        struct ice_hw *hw = &pf->hw;
        u32 completion_offset;
-       int status;
        int err;
 
        memset(&event, 0, sizeof(event));
        dev_dbg(dev, "Writing block of %u bytes for module 0x%02x at offset %u\n",
                block_size, module, offset);
 
-       status = ice_aq_update_nvm(hw, module, offset, block_size, block,
-                                  last_cmd, 0, NULL);
-       if (status) {
+       err = ice_aq_update_nvm(hw, module, offset, block_size, block,
+                               last_cmd, 0, NULL);
+       if (err) {
                dev_err(dev, "Failed to flash module 0x%02x with block of size %u at offset %u, err %d aq_err %s\n",
-                       module, block_size, offset, status,
+                       module, block_size, offset, err,
                        ice_aq_str(hw->adminq.sq_last_status));
                NL_SET_ERR_MSG_MOD(extack, "Failed to program flash module");
                return -EIO;
        struct ice_rq_event_info event;
        struct ice_hw *hw = &pf->hw;
        struct devlink *devlink;
-       int status;
        int err;
 
        dev_dbg(dev, "Beginning erase of flash component '%s', module 0x%02x\n", component, module);
 
        devlink_flash_update_timeout_notify(devlink, "Erasing", component, ICE_FW_ERASE_TIMEOUT);
 
-       status = ice_aq_erase_nvm(hw, module, NULL);
-       if (status) {
+       err = ice_aq_erase_nvm(hw, module, NULL);
+       if (err) {
                dev_err(dev, "Failed to erase %s (module 0x%02x), err %d aq_err %s\n",
-                       component, module, status,
+                       component, module, err,
                        ice_aq_str(hw->adminq.sq_last_status));
                NL_SET_ERR_MSG_MOD(extack, "Failed to erase flash module");
                err = -EIO;
        struct ice_rq_event_info event;
        struct ice_hw *hw = &pf->hw;
        u16 completion_retval;
-       int status;
        int err;
 
        memset(&event, 0, sizeof(event));
 
-       status = ice_nvm_write_activate(hw, activate_flags);
-       if (status) {
+       err = ice_nvm_write_activate(hw, activate_flags);
+       if (err) {
                dev_err(dev, "Failed to switch active flash banks, err %d aq_err %s\n",
-                       status, ice_aq_str(hw->adminq.sq_last_status));
+                       err, ice_aq_str(hw->adminq.sq_last_status));
                NL_SET_ERR_MSG_MOD(extack, "Failed to switch active flash banks");
                return -EIO;
        }
        struct device *dev = ice_pf_to_dev(pf);
        struct ice_hw *hw = &pf->hw;
        struct ice_fwu_priv priv;
-       int status;
        int err;
 
        switch (preservation) {
        priv.pf = pf;
        priv.activate_flags = preservation;
 
-       status = ice_acquire_nvm(hw, ICE_RES_WRITE);
-       if (status) {
+       err = ice_acquire_nvm(hw, ICE_RES_WRITE);
+       if (err) {
                dev_err(dev, "Failed to acquire device flash lock, err %d aq_err %s\n",
-                       status, ice_aq_str(hw->adminq.sq_last_status));
+                       err, ice_aq_str(hw->adminq.sq_last_status));
                NL_SET_ERR_MSG_MOD(extack, "Failed to acquire device flash lock");
                return -EIO;
        }
        struct ice_hw_dev_caps *dev_caps;
        struct ice_hw *hw = &pf->hw;
        u8 pending = 0;
-       int status;
        int err;
 
        dev_caps = kzalloc(sizeof(*dev_caps), GFP_KERNEL);
         * may have changed, e.g. if an update was previously completed and
         * the system has not yet rebooted.
         */
-       status = ice_discover_dev_caps(hw, dev_caps);
-       if (status) {
+       err = ice_discover_dev_caps(hw, dev_caps);
+       if (err) {
                NL_SET_ERR_MSG_MOD(extack, "Unable to read device capabilities");
                kfree(dev_caps);
                return -EIO;
                                           "Canceling previous pending update",
                                           component, 0, 0);
 
-       status = ice_acquire_nvm(hw, ICE_RES_WRITE);
-       if (status) {
+       err = ice_acquire_nvm(hw, ICE_RES_WRITE);
+       if (err) {
                dev_err(dev, "Failed to acquire device flash lock, err %d aq_err %s\n",
-                       status,
-                       ice_aq_str(hw->adminq.sq_last_status));
+                       err, ice_aq_str(hw->adminq.sq_last_status));
                NL_SET_ERR_MSG_MOD(extack, "Failed to acquire device flash lock");
                return -EIO;
        }
 
 {
        struct ice_pf *pf = vsi->back;
        struct device *dev;
-       int err = 0;
-       int status;
+       int err;
 
        dev = ice_pf_to_dev(pf);
 
-       status = ice_fltr_remove_vlan(vsi, vid, ICE_FWD_TO_VSI);
-       if (!status) {
+       err = ice_fltr_remove_vlan(vsi, vid, ICE_FWD_TO_VSI);
+       if (!err) {
                vsi->num_vlan--;
-       } else if (status == -ENOENT) {
+       } else if (err == -ENOENT) {
                dev_dbg(dev, "Failed to remove VLAN %d on VSI %i, it does not exist, error: %d\n",
-                       vid, vsi->vsi_num, status);
+                       vid, vsi->vsi_num, err);
+               err = 0;
        } else {
                dev_err(dev, "Error removing VLAN %d on vsi %i error: %d\n",
-                       vid, vsi->vsi_num, status);
+                       vid, vsi->vsi_num, err);
                err = -EIO;
        }
 
 {
        struct ice_hw *hw = &vsi->back->hw;
        struct ice_vsi_ctx *ctxt;
-       int ret = 0;
-       int status;
+       int ret;
 
        ctxt = kzalloc(sizeof(*ctxt), GFP_KERNEL);
        if (!ctxt)
 
        ctxt->info.valid_sections = cpu_to_le16(ICE_AQ_VSI_PROP_VLAN_VALID);
 
-       status = ice_update_vsi(hw, vsi->idx, ctxt, NULL);
-       if (status) {
+       ret = ice_update_vsi(hw, vsi->idx, ctxt, NULL);
+       if (ret) {
                dev_err(ice_pf_to_dev(vsi->back), "update VSI for VLAN insert failed, err %d aq_err %s\n",
-                       status,
-                       ice_aq_str(hw->adminq.sq_last_status));
+                       ret, ice_aq_str(hw->adminq.sq_last_status));
                ret = -EIO;
                goto out;
        }
 {
        struct ice_hw *hw = &vsi->back->hw;
        struct ice_vsi_ctx *ctxt;
-       int status;
-       int ret = 0;
+       int ret;
 
        /* do not allow modifying VLAN stripping when a port VLAN is configured
         * on this VSI
 
        ctxt->info.valid_sections = cpu_to_le16(ICE_AQ_VSI_PROP_VLAN_VALID);
 
-       status = ice_update_vsi(hw, vsi->idx, ctxt, NULL);
-       if (status) {
+       ret = ice_update_vsi(hw, vsi->idx, ctxt, NULL);
+       if (ret) {
                dev_err(ice_pf_to_dev(vsi->back), "update VSI for VLAN strip failed, ena = %d err %d aq_err %s\n",
-                       ena, status,
-                       ice_aq_str(hw->adminq.sq_last_status));
+                       ena, ret, ice_aq_str(hw->adminq.sq_last_status));
                ret = -EIO;
                goto out;
        }
        struct device *dev = ice_pf_to_dev(pf);
        struct ice_vsi *vsi;
        int ret, i;
-       int status;
 
        if (vsi_type == ICE_VSI_CHNL)
                vsi = ice_vsi_alloc(pf, vsi_type, ch, ICE_INVAL_VFID);
        }
 
        dev_dbg(dev, "vsi->tc_cfg.ena_tc = %d\n", vsi->tc_cfg.ena_tc);
-       status = ice_cfg_vsi_lan(vsi->port_info, vsi->idx, vsi->tc_cfg.ena_tc,
-                                max_txqs);
-       if (status) {
+       ret = ice_cfg_vsi_lan(vsi->port_info, vsi->idx, vsi->tc_cfg.ena_tc,
+                             max_txqs);
+       if (ret) {
                dev_err(dev, "VSI %d failed lan queue config, error %d\n",
-                       vsi->vsi_num, status);
+                       vsi->vsi_num, ret);
                goto unroll_clear_rings;
        }
 
        enum ice_vsi_type vtype;
        struct ice_pf *pf;
        int ret, i;
-       int status;
 
        if (!vsi)
                return -EINVAL;
                /* If MQPRIO is set, means channel code path, hence for main
                 * VSI's, use TC as 1
                 */
-               status = ice_cfg_vsi_lan(vsi->port_info, vsi->idx, 1, max_txqs);
+               ret = ice_cfg_vsi_lan(vsi->port_info, vsi->idx, 1, max_txqs);
        else
-               status = ice_cfg_vsi_lan(vsi->port_info, vsi->idx,
-                                        vsi->tc_cfg.ena_tc, max_txqs);
+               ret = ice_cfg_vsi_lan(vsi->port_info, vsi->idx,
+                                     vsi->tc_cfg.ena_tc, max_txqs);
 
-       if (status) {
+       if (ret) {
                dev_err(ice_pf_to_dev(pf), "VSI %d failed lan queue config, error %d\n",
-                       vsi->vsi_num, status);
+                       vsi->vsi_num, ret);
                if (init_vsi) {
                        ret = -EIO;
                        goto err_vectors;
        struct device *dev;
        int i, ret = 0;
        u8 num_tc = 0;
-       int status;
 
        dev = ice_pf_to_dev(pf);
        if (vsi->tc_cfg.ena_tc == ena_tc &&
 
        /* must to indicate which section of VSI context are being modified */
        ctx->info.valid_sections = cpu_to_le16(ICE_AQ_VSI_PROP_RXQ_MAP_VALID);
-       status = ice_update_vsi(&pf->hw, vsi->idx, ctx, NULL);
-       if (status) {
+       ret = ice_update_vsi(&pf->hw, vsi->idx, ctx, NULL);
+       if (ret) {
                dev_info(dev, "Failed VSI Update\n");
                ret = -EIO;
                goto out;
 
        if (vsi->type == ICE_VSI_PF &&
            test_bit(ICE_FLAG_TC_MQPRIO, pf->flags))
-               status = ice_cfg_vsi_lan(vsi->port_info, vsi->idx, 1,
-                                        max_txqs);
+               ret = ice_cfg_vsi_lan(vsi->port_info, vsi->idx, 1, max_txqs);
        else
-               status = ice_cfg_vsi_lan(vsi->port_info, vsi->idx,
-                                        vsi->tc_cfg.ena_tc, max_txqs);
+               ret = ice_cfg_vsi_lan(vsi->port_info, vsi->idx,
+                                     vsi->tc_cfg.ena_tc, max_txqs);
 
-       if (status) {
+       if (ret) {
                dev_err(dev, "VSI %d failed TC config, error %d\n",
-                       vsi->vsi_num, status);
+                       vsi->vsi_num, ret);
                ret = -EIO;
                goto out;
        }
 
        struct ice_pf *pf = vsi->back;
        struct ice_hw *hw = &pf->hw;
        u32 changed_flags = 0;
-       int status = 0;
        u8 promisc_m;
-       int err = 0;
+       int err;
 
        if (!vsi->netdev)
                return -EINVAL;
        }
 
        /* Remove MAC addresses in the unsync list */
-       status = ice_fltr_remove_mac_list(vsi, &vsi->tmp_unsync_list);
+       err = ice_fltr_remove_mac_list(vsi, &vsi->tmp_unsync_list);
        ice_fltr_free_list(dev, &vsi->tmp_unsync_list);
-       if (status) {
+       if (err) {
                netdev_err(netdev, "Failed to delete MAC filters\n");
                /* if we failed because of alloc failures, just bail */
-               if (status == -ENOMEM) {
-                       err = -ENOMEM;
+               if (err == -ENOMEM)
                        goto out;
-               }
        }
 
        /* Add MAC addresses in the sync list */
-       status = ice_fltr_add_mac_list(vsi, &vsi->tmp_sync_list);
+       err = ice_fltr_add_mac_list(vsi, &vsi->tmp_sync_list);
        ice_fltr_free_list(dev, &vsi->tmp_sync_list);
        /* If filter is added successfully or already exists, do not go into
         * 'if' condition and report it as error. Instead continue processing
         * rest of the function.
         */
-       if (status && status != -EEXIST) {
+       if (err && err != -EEXIST) {
                netdev_err(netdev, "Failed to add MAC filters\n");
                /* If there is no more space for new umac filters, VSI
                 * should go into promiscuous mode. There should be some
                        goto out;
                }
        }
+       err = 0;
        /* check for changes in promiscuous modes */
        if (changed_flags & IFF_ALLMULTI) {
                if (vsi->current_netdev_flags & IFF_ALLMULTI) {
                                                ~IFF_PROMISC;
                                        goto out_promisc;
                                }
+                               err = 0;
                                ice_cfg_vlan_pruning(vsi, false);
                        }
                } else {
 {
        struct ice_aqc_get_phy_caps_data *pcaps;
        struct ice_pf *pf = pi->hw->back;
-       int err = 0;
-       int status;
+       int err;
 
        pcaps = kzalloc(sizeof(*pcaps), GFP_KERNEL);
        if (!pcaps)
                return -ENOMEM;
 
-       status = ice_aq_get_phy_caps(pi, false, ICE_AQC_REPORT_TOPO_CAP_NO_MEDIA, pcaps,
-                                    NULL);
+       err = ice_aq_get_phy_caps(pi, false, ICE_AQC_REPORT_TOPO_CAP_NO_MEDIA,
+                                 pcaps, NULL);
 
-       if (status) {
+       if (err) {
                dev_err(ice_pf_to_dev(pf), "Get PHY capability failed.\n");
                err = -EIO;
                goto out;
        struct ice_aqc_get_phy_caps_data *pcaps;
        struct ice_phy_info *phy = &pi->phy;
        struct ice_pf *pf = pi->hw->back;
-       int err = 0;
-       int status;
+       int err;
 
        if (!(phy->link_info.link_info & ICE_AQ_MEDIA_AVAILABLE))
                return -EIO;
                return -ENOMEM;
 
        if (ice_fw_supports_report_dflt_cfg(pi->hw))
-               status = ice_aq_get_phy_caps(pi, false, ICE_AQC_REPORT_DFLT_CFG,
-                                            pcaps, NULL);
+               err = ice_aq_get_phy_caps(pi, false, ICE_AQC_REPORT_DFLT_CFG,
+                                         pcaps, NULL);
        else
-               status = ice_aq_get_phy_caps(pi, false, ICE_AQC_REPORT_TOPO_CAP_MEDIA,
-                                            pcaps, NULL);
-       if (status) {
+               err = ice_aq_get_phy_caps(pi, false, ICE_AQC_REPORT_TOPO_CAP_MEDIA,
+                                         pcaps, NULL);
+       if (err) {
                dev_err(ice_pf_to_dev(pf), "Get PHY capability failed.\n");
                err = -EIO;
                goto err_out;
        struct ice_aqc_set_phy_cfg_data *cfg;
        struct ice_phy_info *phy = &pi->phy;
        struct ice_pf *pf = vsi->back;
-       int err = 0;
-       int status;
+       int err;
 
        /* Ensure we have media as we cannot configure a medialess port */
        if (!(phy->link_info.link_info & ICE_AQ_MEDIA_AVAILABLE))
                return -ENOMEM;
 
        /* Get current PHY config */
-       status = ice_aq_get_phy_caps(pi, false, ICE_AQC_REPORT_ACTIVE_CFG, pcaps,
-                                    NULL);
-       if (status) {
+       err = ice_aq_get_phy_caps(pi, false, ICE_AQC_REPORT_ACTIVE_CFG, pcaps,
+                                 NULL);
+       if (err) {
                dev_err(dev, "Failed to get PHY configuration, VSI %d error %d\n",
-                       vsi->vsi_num, status);
+                       vsi->vsi_num, err);
                err = -EIO;
                goto done;
        }
        /* Use PHY topology as baseline for configuration */
        memset(pcaps, 0, sizeof(*pcaps));
        if (ice_fw_supports_report_dflt_cfg(pi->hw))
-               status = ice_aq_get_phy_caps(pi, false, ICE_AQC_REPORT_DFLT_CFG,
-                                            pcaps, NULL);
+               err = ice_aq_get_phy_caps(pi, false, ICE_AQC_REPORT_DFLT_CFG,
+                                         pcaps, NULL);
        else
-               status = ice_aq_get_phy_caps(pi, false, ICE_AQC_REPORT_TOPO_CAP_MEDIA,
-                                            pcaps, NULL);
-       if (status) {
+               err = ice_aq_get_phy_caps(pi, false, ICE_AQC_REPORT_TOPO_CAP_MEDIA,
+                                         pcaps, NULL);
+       if (err) {
                dev_err(dev, "Failed to get PHY caps, VSI %d error %d\n",
-                       vsi->vsi_num, status);
+                       vsi->vsi_num, err);
                err = -EIO;
                goto done;
        }
        /* Enable link and link update */
        cfg->caps |= ICE_AQ_PHY_ENA_AUTO_LINK_UPDT | ICE_AQ_PHY_ENA_LINK;
 
-       status = ice_aq_set_phy_cfg(&pf->hw, pi, cfg, NULL);
-       if (status) {
+       err = ice_aq_set_phy_cfg(&pf->hw, pi, cfg, NULL);
+       if (err) {
                dev_err(dev, "Failed to set phy config, VSI %d error %d\n",
-                       vsi->vsi_num, status);
+                       vsi->vsi_num, err);
                err = -EIO;
        }
 
 {
        struct device *dev = ice_pf_to_dev(pf);
        struct ice_vsi *vsi;
-       int status = 0;
+       int status;
 
        if (ice_is_reset_in_progress(pf->state))
                return -EBUSY;
        if (status)
                goto free_cpu_rx_map;
 
-       return status;
+       return 0;
 
 free_cpu_rx_map:
        ice_free_cpu_rx_rmap(vsi);
        struct sockaddr *addr = pi;
        u8 old_mac[ETH_ALEN];
        u8 flags = 0;
-       int err = 0;
-       int status;
        u8 *mac;
+       int err;
 
        mac = (u8 *)addr->sa_data;
 
        netif_addr_unlock_bh(netdev);
 
        /* Clean up old MAC filter. Not an error if old filter doesn't exist */
-       status = ice_fltr_remove_mac(vsi, old_mac, ICE_FWD_TO_VSI);
-       if (status && status != -ENOENT) {
+       err = ice_fltr_remove_mac(vsi, old_mac, ICE_FWD_TO_VSI);
+       if (err && err != -ENOENT) {
                err = -EADDRNOTAVAIL;
                goto err_update_filters;
        }
 
        /* Add filter for new MAC. If filter exists, return success */
-       status = ice_fltr_add_mac(vsi, mac, ICE_FWD_TO_VSI);
-       if (status == -EEXIST)
+       err = ice_fltr_add_mac(vsi, mac, ICE_FWD_TO_VSI);
+       if (err == -EEXIST)
                /* Although this MAC filter is already present in hardware it's
                 * possible in some cases (e.g. bonding) that dev_addr was
                 * modified outside of the driver and needs to be restored back
                 * to this value.
                 */
                netdev_dbg(netdev, "filter for MAC %pM already exists\n", mac);
-       else if (status)
+       else if (err)
                /* error if the new filter addition failed */
                err = -EADDRNOTAVAIL;
 
 
        /* write new MAC address to the firmware */
        flags = ICE_AQC_MAN_MAC_UPDATE_LAA_WOL;
-       status = ice_aq_manage_mac_write(hw, mac, flags, NULL);
-       if (status) {
+       err = ice_aq_manage_mac_write(hw, mac, flags, NULL);
+       if (err) {
                netdev_err(netdev, "can't set MAC %pM. write to firmware failed error %d\n",
-                          mac, status);
+                          mac, err);
        }
        return 0;
 }
 static int ice_vsi_rebuild_by_type(struct ice_pf *pf, enum ice_vsi_type type)
 {
        struct device *dev = ice_pf_to_dev(pf);
-       int status;
        int i, err;
 
        ice_for_each_vsi(pf, i) {
                }
 
                /* replay filters for the VSI */
-               status = ice_replay_vsi(&pf->hw, vsi->idx);
-               if (status) {
+               err = ice_replay_vsi(&pf->hw, vsi->idx);
+               if (err) {
                        dev_err(dev, "replay VSI failed, error %d, VSI index %d, type %s\n",
-                               status, vsi->idx, ice_vsi_type_str(type));
+                               err, vsi->idx, ice_vsi_type_str(type));
                        return -EIO;
                }
 
 {
        struct device *dev = ice_pf_to_dev(pf);
        struct ice_hw *hw = &pf->hw;
-       int ret;
        int err;
 
        if (test_bit(ICE_DOWN, pf->state))
 
        dev_dbg(dev, "rebuilding PF after reset_type=%d\n", reset_type);
 
-       ret = ice_init_all_ctrlq(hw);
-       if (ret) {
-               dev_err(dev, "control queues init failed %d\n", ret);
+       err = ice_init_all_ctrlq(hw);
+       if (err) {
+               dev_err(dev, "control queues init failed %d\n", err);
                goto err_init_ctrlq;
        }
 
                        ice_load_pkg(NULL, pf);
        }
 
-       ret = ice_clear_pf_cfg(hw);
-       if (ret) {
-               dev_err(dev, "clear PF configuration failed %d\n", ret);
+       err = ice_clear_pf_cfg(hw);
+       if (err) {
+               dev_err(dev, "clear PF configuration failed %d\n", err);
                goto err_init_ctrlq;
        }
 
 
        ice_clear_pxe_mode(hw);
 
-       ret = ice_init_nvm(hw);
-       if (ret) {
-               dev_err(dev, "ice_init_nvm failed %d\n", ret);
+       err = ice_init_nvm(hw);
+       if (err) {
+               dev_err(dev, "ice_init_nvm failed %d\n", err);
                goto err_init_ctrlq;
        }
 
-       ret = ice_get_caps(hw);
-       if (ret) {
-               dev_err(dev, "ice_get_caps failed %d\n", ret);
+       err = ice_get_caps(hw);
+       if (err) {
+               dev_err(dev, "ice_get_caps failed %d\n", err);
                goto err_init_ctrlq;
        }
 
-       ret = ice_aq_set_mac_cfg(hw, ICE_AQ_SET_MAC_FRAME_SIZE_MAX, NULL);
-       if (ret) {
-               dev_err(dev, "set_mac_cfg failed %d\n", ret);
+       err = ice_aq_set_mac_cfg(hw, ICE_AQ_SET_MAC_FRAME_SIZE_MAX, NULL);
+       if (err) {
+               dev_err(dev, "set_mac_cfg failed %d\n", err);
                goto err_init_ctrlq;
        }
 
        ice_update_pf_netdev_link(pf);
 
        /* tell the firmware we are up */
-       ret = ice_send_version(pf);
-       if (ret) {
+       err = ice_send_version(pf);
+       if (err) {
                dev_err(dev, "Rebuild failed due to error sending driver version: %d\n",
-                       ret);
+                       err);
                goto err_vsi_rebuild;
        }
 
        struct ice_aqc_vsi_props *vsi_props;
        struct ice_hw *hw = &vsi->back->hw;
        struct ice_vsi_ctx *ctxt;
-       int ret = 0;
-       int status;
+       int ret;
 
        vsi_props = &vsi->info;
 
                ctxt->info.sw_flags &= ~ICE_AQ_VSI_SW_FLAG_ALLOW_LB;
        ctxt->info.valid_sections = cpu_to_le16(ICE_AQ_VSI_PROP_SW_VALID);
 
-       status = ice_update_vsi(hw, vsi->idx, ctxt, NULL);
-       if (status) {
+       ret = ice_update_vsi(hw, vsi->idx, ctxt, NULL);
+       if (ret) {
                dev_err(ice_pf_to_dev(vsi->back), "update VSI for bridge mode failed, bmode = %d err %d aq_err %s\n",
-                       bmode, status, ice_aq_str(hw->adminq.sq_last_status));
+                       bmode, ret, ice_aq_str(hw->adminq.sq_last_status));
                ret = -EIO;
                goto out;
        }
        struct ice_hw *hw = &pf->hw;
        struct ice_sw *pf_sw;
        int rem, v, err = 0;
-       int status;
 
        pf_sw = pf->first_sw;
        /* find the attribute in the netlink message */
                /* Update the unicast switch filter rules for the corresponding
                 * switch of the netdev
                 */
-               status = ice_update_sw_rule_bridge_mode(hw);
-               if (status) {
+               err = ice_update_sw_rule_bridge_mode(hw);
+               if (err) {
                        netdev_err(dev, "switch rule update failed, mode = %d err %d aq_err %s\n",
-                                  mode, status,
+                                  mode, err,
                                   ice_aq_str(hw->adminq.sq_last_status));
                        /* revert hw->evb_veb */
                        hw->evb_veb = (pf_sw->bridge_mode == BRIDGE_MODE_VEB);
        struct ice_vsi *vsi = np->vsi;
        struct ice_pf *pf = vsi->back;
        struct ice_port_info *pi;
-       int status;
        int err;
 
        if (test_bit(ICE_NEEDS_RESTART, pf->state)) {
        netif_carrier_off(netdev);
 
        pi = vsi->port_info;
-       status = ice_update_link_info(pi);
-       if (status) {
-               netdev_err(netdev, "Failed to get link info, error %d\n",
-                          status);
+       err = ice_update_link_info(pi);
+       if (err) {
+               netdev_err(netdev, "Failed to get link info, error %d\n", err);
                return -EIO;
        }
 
 
        struct ice_adv_lkup_elem *list;
        u32 flags = fltr->flags;
        int lkups_cnt;
-       int ret = 0;
-       int status;
+       int ret;
        int i;
 
        if (!flags || (flags & ICE_TC_FLWR_FIELD_ENC_SRC_L4_PORT)) {
        /* specify the cookie as filter_rule_id */
        rule_info.fltr_rule_id = fltr->cookie;
 
-       status = ice_add_adv_rule(hw, list, lkups_cnt, &rule_info, &rule_added);
-       if (status == -EEXIST) {
+       ret = ice_add_adv_rule(hw, list, lkups_cnt, &rule_info, &rule_added);
+       if (ret == -EEXIST) {
                NL_SET_ERR_MSG_MOD(fltr->extack, "Unable to add filter because it already exist");
                ret = -EINVAL;
                goto exit;
-       } else if (status) {
+       } else if (ret) {
                NL_SET_ERR_MSG_MOD(fltr->extack, "Unable to add filter due to error");
                ret = -EIO;
                goto exit;
 
        u64 entry1_h = 0;
        u64 entry2_h = 0;
        u64 prof_id;
-       int status;
        int ret;
 
        pf = vf->pf;
        prof_id = ICE_FLOW_PROF_FD(vf_vsi->vsi_num, flow,
                                   tun ? ICE_FLTR_PTYPE_MAX : 0);
 
-       status = ice_flow_add_prof(hw, ICE_BLK_FD, ICE_FLOW_RX, prof_id, seg,
-                                  tun + 1, &prof);
-       ret = status;
+       ret = ice_flow_add_prof(hw, ICE_BLK_FD, ICE_FLOW_RX, prof_id, seg,
+                               tun + 1, &prof);
        if (ret) {
                dev_dbg(dev, "Could not add VSI flow 0x%x for VF %d\n",
                        flow, vf->vf_id);
                goto err_exit;
        }
 
-       status = ice_flow_add_entry(hw, ICE_BLK_FD, prof_id, vf_vsi->idx,
-                                   vf_vsi->idx, ICE_FLOW_PRIO_NORMAL,
-                                   seg, &entry1_h);
-       ret = status;
+       ret = ice_flow_add_entry(hw, ICE_BLK_FD, prof_id, vf_vsi->idx,
+                                vf_vsi->idx, ICE_FLOW_PRIO_NORMAL,
+                                seg, &entry1_h);
        if (ret) {
                dev_dbg(dev, "Could not add flow 0x%x VSI entry for VF %d\n",
                        flow, vf->vf_id);
                goto err_prof;
        }
 
-       status = ice_flow_add_entry(hw, ICE_BLK_FD, prof_id, vf_vsi->idx,
-                                   ctrl_vsi->idx, ICE_FLOW_PRIO_NORMAL,
-                                   seg, &entry2_h);
-       ret = status;
+       ret = ice_flow_add_entry(hw, ICE_BLK_FD, prof_id, vf_vsi->idx,
+                                ctrl_vsi->idx, ICE_FLOW_PRIO_NORMAL,
+                                seg, &entry2_h);
        if (ret) {
                dev_dbg(dev,
                        "Could not add flow 0x%x Ctrl VSI entry for VF %d\n",
        struct device *dev;
        struct ice_pf *pf;
        struct ice_hw *hw;
-       int status;
        int ret;
        u8 *pkt;
 
                return -ENOMEM;
 
        ice_fdir_get_prgm_desc(hw, input, &desc, add);
-       status = ice_fdir_get_gen_prgm_pkt(hw, input, pkt, false, is_tun);
-       ret = status;
+       ret = ice_fdir_get_gen_prgm_pkt(hw, input, pkt, false, is_tun);
        if (ret) {
                dev_dbg(dev, "Gen training pkt for VF %d ptype %d failed\n",
                        vf->vf_id, input->flow_type);
 
        struct ice_hw *hw = &vsi->back->hw;
        struct ice_aqc_vsi_props *info;
        struct ice_vsi_ctx *ctxt;
-       int ret = 0;
-       int status;
+       int ret;
 
        ctxt = kzalloc(sizeof(*ctxt), GFP_KERNEL);
        if (!ctxt)
        info->valid_sections = cpu_to_le16(ICE_AQ_VSI_PROP_VLAN_VALID |
                                           ICE_AQ_VSI_PROP_SW_VALID);
 
-       status = ice_update_vsi(hw, vsi->idx, ctxt, NULL);
-       if (status) {
+       ret = ice_update_vsi(hw, vsi->idx, ctxt, NULL);
+       if (ret) {
                dev_info(ice_hw_to_dev(hw), "update VSI for port VLAN failed, err %d aq_err %s\n",
-                        status, ice_aq_str(hw->adminq.sq_last_status));
+                        ret, ice_aq_str(hw->adminq.sq_last_status));
                ret = -EIO;
                goto out;
        }
        u8 broadcast[ETH_ALEN];
        struct ice_vsi *vsi;
        struct device *dev;
-       int status;
        int err;
 
        vf->first_vector_idx = ice_calc_vf_first_vector_idx(pf, vf);
        }
 
        eth_broadcast_addr(broadcast);
-       status = ice_fltr_add_mac(vsi, broadcast, ICE_FWD_TO_VSI);
-       if (status) {
+       err = ice_fltr_add_mac(vsi, broadcast, ICE_FWD_TO_VSI);
+       if (err) {
                dev_err(dev, "Failed to add broadcast MAC filter for VF %d, error %d\n",
-                       vf->vf_id, status);
-               err = status;
+                       vf->vf_id, err);
                goto release_vsi;
        }
 
 {
        struct ice_pf *pf = pci_get_drvdata(pdev);
        struct device *dev = ice_pf_to_dev(pf);
-       int status;
        int err;
 
        err = ice_check_sriov_allowed(pf);
                return -EBUSY;
        }
 
-       status = ice_mbx_init_snapshot(&pf->hw, num_vfs);
-       if (status)
-               return status;
+       err = ice_mbx_init_snapshot(&pf->hw, num_vfs);
+       if (err)
+               return err;
 
        err = ice_pci_sriov_ena(pf, num_vfs);
        if (err) {
        struct ice_vsi *vf_vsi;
        struct device *dev;
        struct ice_vf *vf;
-       int status;
        int ret;
 
        dev = ice_pf_to_dev(pf);
                           ICE_AQ_VSI_SEC_TX_PRUNE_ENA_S));
        }
 
-       status = ice_update_vsi(&pf->hw, vf_vsi->idx, ctx, NULL);
-       if (status) {
+       ret = ice_update_vsi(&pf->hw, vf_vsi->idx, ctx, NULL);
+       if (ret) {
                dev_err(dev, "Failed to %sable spoofchk on VF %d VSI %d\n error %d\n",
-                       ena ? "en" : "dis", vf->vf_id, vf_vsi->vsi_num,
-                       status);
+                       ena ? "en" : "dis", vf->vf_id, vf_vsi->vsi_num, ret);
                ret = -EIO;
                goto out;
        }
 {
        struct device *dev = ice_pf_to_dev(vf->pf);
        u8 *mac_addr = vc_ether_addr->addr;
-       int ret = 0;
-       int status;
+       int ret;
 
        /* device MAC already added */
        if (ether_addr_equal(mac_addr, vf->dev_lan_addr.addr))
                return -EPERM;
        }
 
-       status = ice_fltr_add_mac(vsi, mac_addr, ICE_FWD_TO_VSI);
-       if (status == -EEXIST) {
+       ret = ice_fltr_add_mac(vsi, mac_addr, ICE_FWD_TO_VSI);
+       if (ret == -EEXIST) {
                dev_dbg(dev, "MAC %pM already exists for VF %d\n", mac_addr,
                        vf->vf_id);
                /* don't return since we might need to update
                 * the primary MAC in ice_vfhw_mac_add() below
                 */
-               ret = -EEXIST;
-       } else if (status) {
+       } else if (ret) {
                dev_err(dev, "Failed to add MAC %pM for VF %d\n, error %d\n",
-                       mac_addr, vf->vf_id, status);
+                       mac_addr, vf->vf_id, ret);
                return -EIO;
        } else {
                vf->num_mac++;