| Message ID | 20200506061835.19662-1-yanaijie@huawei.com |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | David Miller |
| Headers | show |
| Series | [net-next] i40e: Make i40e_shutdown_adminq() return void | expand |
From: Jason Yan <yanaijie@huawei.com> Date: Wed, 6 May 2020 14:18:35 +0800 > Fix the following coccicheck warning: > > drivers/net/ethernet/intel/i40e/i40e_adminq.c:699:13-21: Unneeded > variable: "ret_code". Return "0" on line 710 > > Signed-off-by: Jason Yan <yanaijie@huawei.com> Jeff, please pick this up. Thank you.
> -----Original Message----- > From: David Miller <davem@davemloft.net> > Sent: Wednesday, May 6, 2020 14:03 > To: yanaijie@huawei.com > Cc: Kirsher, Jeffrey T <jeffrey.t.kirsher@intel.com>; Azarewicz, Piotr > <piotr.azarewicz@intel.com>; intel-wired-lan@lists.osuosl.org; > netdev@vger.kernel.org; linux-kernel@vger.kernel.org > Subject: Re: [PATCH net-next] i40e: Make i40e_shutdown_adminq() return void > > From: Jason Yan <yanaijie@huawei.com> > Date: Wed, 6 May 2020 14:18:35 +0800 > > > Fix the following coccicheck warning: > > > > drivers/net/ethernet/intel/i40e/i40e_adminq.c:699:13-21: Unneeded > > variable: "ret_code". Return "0" on line 710 > > > > Signed-off-by: Jason Yan <yanaijie@huawei.com> > > Jeff, please pick this up. > > Thank you. [Kirsher, Jeffrey T] Yep already added it to my queue, thanks.
-----Original Message----- From: Intel-wired-lan <intel-wired-lan-bounces@osuosl.org> On Behalf Of Jason Yan Sent: Tuesday, May 5, 2020 11:19 PM To: Kirsher, Jeffrey T <jeffrey.t.kirsher@intel.com>; davem@davemloft.net; Azarewicz, Piotr <piotr.azarewicz@intel.com>; intel-wired-lan@lists.osuosl.org; netdev@vger.kernel.org; linux-kernel@vger.kernel.org Cc: Jason Yan <yanaijie@huawei.com> Subject: [Intel-wired-lan] [PATCH net-next] i40e: Make i40e_shutdown_adminq() return void Fix the following coccicheck warning: drivers/net/ethernet/intel/i40e/i40e_adminq.c:699:13-21: Unneeded variable: "ret_code". Return "0" on line 710 Signed-off-by: Jason Yan <yanaijie@huawei.com> --- drivers/net/ethernet/intel/i40e/i40e_adminq.c | 6 +----- drivers/net/ethernet/intel/i40e/i40e_prototype.h | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
diff --git a/drivers/net/ethernet/intel/i40e/i40e_adminq.c b/drivers/net/ethernet/intel/i40e/i40e_adminq.c index 37514a75f928..6a089848c857 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_adminq.c +++ b/drivers/net/ethernet/intel/i40e/i40e_adminq.c @@ -694,10 +694,8 @@ i40e_status i40e_init_adminq(struct i40e_hw *hw) * i40e_shutdown_adminq - shutdown routine for the Admin Queue * @hw: pointer to the hardware structure **/ -i40e_status i40e_shutdown_adminq(struct i40e_hw *hw) +void i40e_shutdown_adminq(struct i40e_hw *hw) { - i40e_status ret_code = 0; - if (i40e_check_asq_alive(hw)) i40e_aq_queue_shutdown(hw, true); @@ -706,8 +704,6 @@ i40e_status i40e_shutdown_adminq(struct i40e_hw *hw) if (hw->nvm_buff.va) i40e_free_virt_mem(hw, &hw->nvm_buff); - - return ret_code; } /** diff --git a/drivers/net/ethernet/intel/i40e/i40e_prototype.h b/drivers/net/ethernet/intel/i40e/i40e_prototype.h index bbb478f09093..5c1378641b3b 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_prototype.h +++ b/drivers/net/ethernet/intel/i40e/i40e_prototype.h @@ -17,7 +17,7 @@ /* adminq functions */ i40e_status i40e_init_adminq(struct i40e_hw *hw); -i40e_status i40e_shutdown_adminq(struct i40e_hw *hw); +void i40e_shutdown_adminq(struct i40e_hw *hw); void i40e_adminq_init_ring_data(struct i40e_hw *hw); i40e_status i40e_clean_arq_element(struct i40e_hw *hw, struct i40e_arq_event_info *e,
Fix the following coccicheck warning: drivers/net/ethernet/intel/i40e/i40e_adminq.c:699:13-21: Unneeded variable: "ret_code". Return "0" on line 710 Signed-off-by: Jason Yan <yanaijie@huawei.com> --- drivers/net/ethernet/intel/i40e/i40e_adminq.c | 6 +----- drivers/net/ethernet/intel/i40e/i40e_prototype.h | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-)