| Message ID | 1428450342-48517-11-git-send-email-catherine.sullivan@intel.com |
|---|---|
| State | Accepted |
| Delegated to: | Jeff Kirsher |
| Headers | show |
On Tue, 2015-04-07 at 19:45 -0400, Catherine Sullivan wrote: > From: Jesse Brandeburg <jesse.brandeburg@intel.com> > > These changes just remove unused variables and any code that uses them > as the results of storing into these variables doesn't have any > side effects that I can see or provide any benefit. > > Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> > Change-ID: I8a5ec7132ff1443d23aae729cef94beaaaf19e3a > --- > drivers/net/ethernet/intel/i40e/i40e_dcb.c | 6 ++---- > drivers/net/ethernet/intel/i40e/i40e_nvm.c | 3 +-- > 2 files changed, 3 insertions(+), 6 deletions(-) Thanks Catherine, I have added your patch to my queue.
-----Original Message----- From: Kirsher, Jeffrey T Sent: Tuesday, April 07, 2015 4:59 PM To: Sullivan, Catherine; Young, James M Cc: intel-wired-lan@lists.osuosl.org Subject: Re: [Intel-wired-lan] [net-next S3 11/13] i40e: get rid of unused locals On Tue, 2015-04-07 at 19:45 -0400, Catherine Sullivan wrote: > From: Jesse Brandeburg <jesse.brandeburg@intel.com> > > These changes just remove unused variables and any code that uses them > as the results of storing into these variables doesn't have any side > effects that I can see or provide any benefit. > > Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> > Change-ID: I8a5ec7132ff1443d23aae729cef94beaaaf19e3a > --- > drivers/net/ethernet/intel/i40e/i40e_dcb.c | 6 ++---- > drivers/net/ethernet/intel/i40e/i40e_nvm.c | 3 +-- > 2 files changed, 3 insertions(+), 6 deletions(-) Thanks Catherine, I have added your patch to my queue. -- git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue.git dev-queue Tested-by: Jim Young <james.m.young@intel.com>
diff --git a/drivers/net/ethernet/intel/i40e/i40e_dcb.c b/drivers/net/ethernet/intel/i40e/i40e_dcb.c index 6e14667..2547aa2 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_dcb.c +++ b/drivers/net/ethernet/intel/i40e/i40e_dcb.c @@ -419,7 +419,7 @@ static void i40e_cee_to_dcb_v1_config( { u16 status, tlv_status = le16_to_cpu(cee_cfg->tlv_status); u16 app_prio = le16_to_cpu(cee_cfg->oper_app_prio); - u8 i, tc, err, sync, oper; + u8 i, tc, err; /* CEE PG data to ETS config */ dcbcfg->etscfg.maxtcs = cee_cfg->oper_num_tc; @@ -456,9 +456,7 @@ static void i40e_cee_to_dcb_v1_config( status = (tlv_status & I40E_AQC_CEE_APP_STATUS_MASK) >> I40E_AQC_CEE_APP_STATUS_SHIFT; err = (status & I40E_TLV_STATUS_ERR) ? 1 : 0; - sync = (status & I40E_TLV_STATUS_SYNC) ? 1 : 0; - oper = (status & I40E_TLV_STATUS_OPER) ? 1 : 0; - /* Add APPs if Error is False and Oper/Sync is True */ + /* Add APPs if Error is False */ if (!err) { /* CEE operating configuration supports FCoE/iSCSI/FIP only */ dcbcfg->numapps = I40E_CEE_OPER_MAX_APPS; diff --git a/drivers/net/ethernet/intel/i40e/i40e_nvm.c b/drivers/net/ethernet/intel/i40e/i40e_nvm.c index e49acd2..554e49d 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_nvm.c +++ b/drivers/net/ethernet/intel/i40e/i40e_nvm.c @@ -821,13 +821,12 @@ static enum i40e_nvmupd_cmd i40e_nvmupd_validate_command(struct i40e_hw *hw, int *errno) { enum i40e_nvmupd_cmd upd_cmd; - u8 transaction, module; + u8 transaction; /* anything that doesn't match a recognized case is an error */ upd_cmd = I40E_NVMUPD_INVALID; transaction = i40e_nvmupd_get_transaction(cmd->config); - module = i40e_nvmupd_get_module(cmd->config); /* limits on data size */ if ((cmd->data_size < 1) ||