diff options
| author | Jacob Keller <jacob.e.keller@intel.com> | 2021-10-11 17:41:11 -0700 |
|---|---|---|
| committer | Tony Nguyen <anthony.l.nguyen@intel.com> | 2021-12-15 08:36:10 -0800 |
| commit | c356eaa82401f159f48f29aea8440a058cc5da8d (patch) | |
| tree | 76def9ea1b76ebfd8565eea4cbe2e545d0e0d86f /drivers/net/ethernet/intel/ice/ice_fw_update.h | |
| parent | 78ad87da99788538f3f26235fe78bc52075a6f4f (diff) | |
| download | linux-c356eaa82401f159f48f29aea8440a058cc5da8d.tar.gz linux-c356eaa82401f159f48f29aea8440a058cc5da8d.tar.bz2 linux-c356eaa82401f159f48f29aea8440a058cc5da8d.zip | |
ice: move and rename ice_check_for_pending_update
The ice_devlink_flash_update function performs a few checks and then
calls ice_flash_pldm_image. One of these checks is to call
ice_check_for_pending_update. This function checks if the device has
a pending update, and cancels it if so. This is necessary to allow
a new flash update to proceed.
We want to refactor the ice code to eliminate ice_devlink_flash_update,
moving its checks into ice_flash_pldm_image.
To do this, ice_check_for_pending_update will become static, and only
called by ice_flash_pldm_image. To make this change easier to review,
first just move the function up within the ice_fw_update.c file.
While at it, note that the function has a misleading name. Its primary
action is to cancel a pending update. Using the verb "check" does not
imply this. Rename it to ice_cancel_pending_update.
Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Tested-by: Gurucharan G <gurucharanx.g@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
Diffstat (limited to 'drivers/net/ethernet/intel/ice/ice_fw_update.h')
| -rw-r--r-- | drivers/net/ethernet/intel/ice/ice_fw_update.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/intel/ice/ice_fw_update.h b/drivers/net/ethernet/intel/ice/ice_fw_update.h index c6390f6851ff..1f84ef18bfd1 100644 --- a/drivers/net/ethernet/intel/ice/ice_fw_update.h +++ b/drivers/net/ethernet/intel/ice/ice_fw_update.h @@ -6,7 +6,7 @@ int ice_flash_pldm_image(struct ice_pf *pf, const struct firmware *fw, u8 preservation, struct netlink_ext_ack *extack); -int ice_check_for_pending_update(struct ice_pf *pf, const char *component, - struct netlink_ext_ack *extack); +int ice_cancel_pending_update(struct ice_pf *pf, const char *component, + struct netlink_ext_ack *extack); #endif |