[PATCH 1/1] ice: remove the unused function ice_aq_nvm_update_empr

From: Zhu Yanjun <redacted>

The function ice_aq_nvm_update_empr is not used, so remove it.

Signed-off-by: Zhu Yanjun <redacted>
---
 drivers/net/ethernet/intel/ice/ice_nvm.c | 16 ----------------
 drivers/net/ethernet/intel/ice/ice_nvm.h |  1 -
 2 files changed, 17 deletions(-)

diff --git a/drivers/net/ethernet/intel/ice/ice_nvm.c b/drivers/net/ethernet/intel/ice/ice_nvm.c
index fee37a5844cf..bad374bd7ab3 100644
--- a/drivers/net/ethernet/intel/ice/ice_nvm.c
+++ b/drivers/net/ethernet/intel/ice/ice_nvm.c

@@ -1106,22 +1106,6 @@ enum ice_status ice_nvm_write_activate(struct ice_hw *hw, u8 cmd_flags)
 	return ice_aq_send_cmd(hw, &desc, NULL, 0, NULL);
 }
 
-/**
- * ice_aq_nvm_update_empr
- * @hw: pointer to the HW struct
- *
- * Update empr (0x0709). This command allows SW to
- * request an EMPR to activate new FW.
- */
-enum ice_status ice_aq_nvm_update_empr(struct ice_hw *hw)
-{
-	struct ice_aq_desc desc;
-
-	ice_fill_dflt_direct_cmd_desc(&desc, ice_aqc_opc_nvm_update_empr);
-
-	return ice_aq_send_cmd(hw, &desc, NULL, 0, NULL);
-}
-
 /* ice_nvm_set_pkg_data
  * @hw: pointer to the HW struct
  * @del_pkg_data_flag: If is set then the current pkg_data store by FW

diff --git a/drivers/net/ethernet/intel/ice/ice_nvm.h b/drivers/net/ethernet/intel/ice/ice_nvm.h
index c6f05f43d593..925225905491 100644
--- a/drivers/net/ethernet/intel/ice/ice_nvm.h
+++ b/drivers/net/ethernet/intel/ice/ice_nvm.h

@@ -39,7 +39,6 @@ enum ice_status
 ice_aq_erase_nvm(struct ice_hw *hw, u16 module_typeid, struct ice_sq_cd *cd);
 enum ice_status ice_nvm_validate_checksum(struct ice_hw *hw);
 enum ice_status ice_nvm_write_activate(struct ice_hw *hw, u8 cmd_flags);
-enum ice_status ice_aq_nvm_update_empr(struct ice_hw *hw);
 enum ice_status
 ice_nvm_set_pkg_data(struct ice_hw *hw, bool del_pkg_data_flag, u8 *data,
 		     u16 length, struct ice_sq_cd *cd);

-- 
2.27.0

On 10/19/2021 2:17 AM, yanjun.zhu@linux.dev wrote:

From: Zhu Yanjun <redacted>

The function ice_aq_nvm_update_empr is not used, so remove it.

Signed-off-by: Zhu Yanjun <redacted>

Thanks for the patch!
Reviewed-by: Jesse Brandeburg <redacted>

在 2021/10/19 23:30, Jesse Brandeburg 写道:

On 10/19/2021 2:17 AM, yanjun.zhu@linux.dev wrote:

quoted

From: Zhu Yanjun <redacted>

The function ice_aq_nvm_update_empr is not used, so remove it.

Signed-off-by: Zhu Yanjun <redacted>

Thanks for the patch!
Reviewed-by: Jesse Brandeburg <redacted>

Thanks, Jesse

Zhu Yanjun

On Tue, 2021-10-19 at 05:17 -0400, yanjun.zhu@linux.dev wrote:

From: Zhu Yanjun <redacted>

The function ice_aq_nvm_update_empr is not used, so remove it.

Thanks for the patch, but there is another one coming soon that will be
using this function[1]. I'd prefer to keep this to save us from another
patch reintroducing it in the near future.

Thanks,
Tony

[1] https://patchwork.ozlabs.org/project/intel-wired-
lan/patch/20211019215423.3383750-1-jacob.e.keller@intel.com/

October 21, 2021 2:49 AM, "Nguyen, Anthony L" [off-list ref] wrote:

On Tue, 2021-10-19 at 05:17 -0400, yanjun.zhu@linux.dev wrote:

quoted

From: Zhu Yanjun <redacted>

The function ice_aq_nvm_update_empr is not used, so remove it.

Thanks for the patch, but there is another one coming soon that will be
using this function[1]. I'd prefer to keep this to save us from another
patch reintroducing it in the near future.

Got it.

Zhu Yanjun

Thanks,
Tony

[1] https://patchwork.ozlabs.org/project/intel-wired-
lan/patch/20211019215423.3383750-1-jacob.e.keller@intel.com/

quoted

Signed-off-by: Zhu Yanjun <redacted>
---
drivers/net/ethernet/intel/ice/ice_nvm.c | 16 ----------------
drivers/net/ethernet/intel/ice/ice_nvm.h |  1 -
2 files changed, 17 deletions(-)

diff --git a/drivers/net/ethernet/intel/ice/ice_nvm.c

b/drivers/net/ethernet/intel/ice/ice_nvm.c
index fee37a5844cf..bad374bd7ab3 100644

--- a/drivers/net/ethernet/intel/ice/ice_nvm.c
+++ b/drivers/net/ethernet/intel/ice/ice_nvm.c

@@ -1106,22 +1106,6 @@ enum ice_status ice_nvm_write_activate(struct

ice_hw *hw, u8 cmd_flags)
return ice_aq_send_cmd(hw, &desc, NULL, 0, NULL);
}

-/**
- * ice_aq_nvm_update_empr
- * @hw: pointer to the HW struct
- *
- * Update empr (0x0709). This command allows SW to
- * request an EMPR to activate new FW.
- */
-enum ice_status ice_aq_nvm_update_empr(struct ice_hw *hw)
-{
-       struct ice_aq_desc desc;
-
-       ice_fill_dflt_direct_cmd_desc(&desc,
ice_aqc_opc_nvm_update_empr);
-
-       return ice_aq_send_cmd(hw, &desc, NULL, 0, NULL);
-}
-
/* ice_nvm_set_pkg_data
* @hw: pointer to the HW struct
* @del_pkg_data_flag: If is set then the current pkg_data store by
FW

diff --git a/drivers/net/ethernet/intel/ice/ice_nvm.h

b/drivers/net/ethernet/intel/ice/ice_nvm.h
index c6f05f43d593..925225905491 100644

--- a/drivers/net/ethernet/intel/ice/ice_nvm.h
+++ b/drivers/net/ethernet/intel/ice/ice_nvm.h

@@ -39,7 +39,6 @@ enum ice_status

ice_aq_erase_nvm(struct ice_hw *hw, u16 module_typeid, struct
ice_sq_cd *cd);
enum ice_status ice_nvm_validate_checksum(struct ice_hw *hw);
enum ice_status ice_nvm_write_activate(struct ice_hw *hw, u8
cmd_flags);
-enum ice_status ice_aq_nvm_update_empr(struct ice_hw *hw);
enum ice_status
ice_nvm_set_pkg_data(struct ice_hw *hw, bool del_pkg_data_flag, u8
*data,
u16 length, struct ice_sq_cd *cd);