diff options
| author | Tony Nguyen <anthony.l.nguyen@intel.com> | 2021-10-07 16:00:23 -0700 |
|---|---|---|
| committer | Tony Nguyen <anthony.l.nguyen@intel.com> | 2021-12-14 10:19:13 -0800 |
| commit | 2ccc1c1ccc671b8bb33ad7845dcf6c75d3c892ae (patch) | |
| tree | c79892d8996543cbe3d1dd74ec1aa5f748de01f4 /drivers/net/ethernet/intel/ice/ice_devlink.c | |
| parent | 5518ac2a64423f226e922b6719cf0eb62c31e141 (diff) | |
| download | linux-2ccc1c1ccc671b8bb33ad7845dcf6c75d3c892ae.tar.gz linux-2ccc1c1ccc671b8bb33ad7845dcf6c75d3c892ae.tar.bz2 linux-2ccc1c1ccc671b8bb33ad7845dcf6c75d3c892ae.zip | |
ice: Remove excess error variables
ice_status previously had a variable to contain these values where other
error codes had a variable as well. With ice_status now being an int,
there is no need for two variables to hold error values. In cases where
this occurs, remove one of the excess variables and use a single one.
Some initialization of variables are no longer needed and have been
removed.
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
Tested-by: Gurucharan G <gurucharanx.g@intel.com>
Diffstat (limited to 'drivers/net/ethernet/intel/ice/ice_devlink.c')
| -rw-r--r-- | drivers/net/ethernet/intel/ice/ice_devlink.c | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/drivers/net/ethernet/intel/ice/ice_devlink.c b/drivers/net/ethernet/intel/ice/ice_devlink.c index dde112e74d41..50003331addc 100644 --- a/drivers/net/ethernet/intel/ice/ice_devlink.c +++ b/drivers/net/ethernet/intel/ice/ice_devlink.c @@ -251,7 +251,6 @@ static int ice_devlink_info_get(struct devlink *devlink, 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; @@ -266,20 +265,20 @@ static int ice_devlink_info_get(struct devlink *devlink, 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; @@ -287,10 +286,10 @@ static int ice_devlink_info_get(struct devlink *devlink, } 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; @@ -298,10 +297,10 @@ static int ice_devlink_info_get(struct devlink *devlink, } 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; |