From: Jiaran Zhang zhangjiaran@huawei.com
driver inclusion category: feature bugzilla: NA CVE: NA
----------------------------
The reset interface multiplexed by flr/resume will be renamed reset_done, so the current reset_done interface is renamed reset_end.
Signed-off-by: Jiaran Zhang zhangjiaran@huawei.com Signed-off-by: Yonglong Liu liuyonglong@huawei.com Reviewed-by: li yongxin liyongxin1@huawei.com Signed-off-by: Yang Yingliang yangyingliang@huawei.com --- drivers/net/ethernet/hisilicon/hns3/hnae3.h | 2 +- .../hns3/hns3_extension/hns3pf/hclge_main_it.c | 4 ++-- .../net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 12 ++++++------ 3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/net/ethernet/hisilicon/hns3/hnae3.h b/drivers/net/ethernet/hisilicon/hns3/hnae3.h index e9fe1e6662905..d5f5e75f43dad 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hnae3.h +++ b/drivers/net/ethernet/hisilicon/hns3/hnae3.h @@ -549,7 +549,7 @@ struct hnae3_ae_ops { void (*set_timer_task)(struct hnae3_handle *handle, bool enable); int (*mac_connect_phy)(struct hnae3_handle *handle); void (*mac_disconnect_phy)(struct hnae3_handle *handle); - bool (*reset_done)(struct hnae3_handle *handle, bool done); + bool (*reset_end)(struct hnae3_handle *handle, bool done); void (*handle_imp_error)(struct hnae3_handle *handle); int (*get_vf_config)(struct hnae3_handle *handle, int vf, struct ifla_vf_info *ivf); diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_extension/hns3pf/hclge_main_it.c b/drivers/net/ethernet/hisilicon/hns3/hns3_extension/hns3pf/hclge_main_it.c index 59e287848ee36..7ac18e21a8bdd 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3_extension/hns3pf/hclge_main_it.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3_extension/hns3pf/hclge_main_it.c @@ -145,7 +145,7 @@ void hclge_reset_event_it(struct pci_dev *pdev, struct hnae3_handle *handle) } }
-bool hclge_reset_done_it(struct hnae3_handle *handle, bool done) +bool hclge_reset_end_it(struct hnae3_handle *handle, bool done) { struct hclge_vport *vport = hclge_get_vport(handle); struct hclge_dev *hdev = vport->back; @@ -210,7 +210,7 @@ int hclge_init_it(void) #endif
hclge_ops.reset_event = hclge_reset_event_it; - hclge_ops.reset_done = hclge_reset_done_it; + hclge_ops.reset_end = hclge_reset_end_it; hclge_ops.handle_imp_error = hclge_handle_imp_error_it;
return hclge_init(); diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c index 23273f08ab50f..d5b6563cce739 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c @@ -3705,8 +3705,8 @@ static bool hclge_reset_err_handle(struct hclge_dev *hdev) /* recover the handshake status when reset fail */ hclge_reset_handshake(hdev, true);
- if (handle && handle->ae_algo->ops->reset_done) - handle->ae_algo->ops->reset_done(handle, false); + if (handle && handle->ae_algo->ops->reset_end) + handle->ae_algo->ops->reset_end(handle, false);
hclge_dbg_dump_rst_info(hdev);
@@ -3859,8 +3859,8 @@ static int hclge_reset_rebuild(struct hclge_dev *hdev) if (reset_level != HNAE3_NONE_RESET) set_bit(reset_level, &hdev->reset_request);
- if (handle && handle->ae_algo->ops->reset_done) - handle->ae_algo->ops->reset_done(handle, true); + if (handle && handle->ae_algo->ops->reset_end) + handle->ae_algo->ops->reset_end(handle, true);
return 0; } @@ -4018,7 +4018,7 @@ static void hclge_reset_timer(struct timer_list *t) hclge_reset_event(hdev->pdev, NULL); }
-static bool hclge_reset_done(struct hnae3_handle *handle, bool done) +static bool hclge_reset_end(struct hnae3_handle *handle, bool done) { struct hclge_vport *vport = hclge_get_vport(handle); struct hclge_dev *hdev = vport->back; @@ -11761,7 +11761,7 @@ struct hnae3_ae_ops hclge_ops = { .set_timer_task = hclge_set_timer_task, .mac_connect_phy = hclge_mac_connect_phy, .mac_disconnect_phy = hclge_mac_disconnect_phy, - .reset_done = hclge_reset_done, + .reset_end = hclge_reset_end, .get_vf_config = hclge_get_vf_config, .set_vf_link_state = hclge_set_vf_link_state, .set_vf_spoofchk = hclge_set_vf_spoofchk,