From 5c5331775d37f8eb9b188fec03009563c3fc384a Mon Sep 17 00:00:00 2001 From: Qi Zhang Date: Tue, 23 Jul 2019 11:51:13 +0800 Subject: [PATCH] net/ice/base: use macro instead of function name use __func__ instead of function name in ice_debug calls. Signed-off-by: Paul M Stillwell Jr Signed-off-by: Qi Zhang Acked-by: Qiming Yang --- drivers/net/ice/base/ice_common.c | 2 +- drivers/net/ice/base/ice_controlq.c | 2 +- drivers/net/ice/base/ice_flex_pipe.c | 12 ++++++------ drivers/net/ice/base/ice_nvm.c | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/net/ice/base/ice_common.c b/drivers/net/ice/base/ice_common.c index 328ff3c314..df66ba826e 100644 --- a/drivers/net/ice/base/ice_common.c +++ b/drivers/net/ice/base/ice_common.c @@ -42,7 +42,7 @@ static enum ice_status ice_set_mac_type(struct ice_hw *hw) { enum ice_status status = ICE_SUCCESS; - ice_debug(hw, ICE_DBG_TRACE, "ice_set_mac_type\n"); + ice_debug(hw, ICE_DBG_TRACE, "%s\n", __func__); if (hw->vendor_id == ICE_INTEL_VENDOR_ID) { switch (hw->device_id) { diff --git a/drivers/net/ice/base/ice_controlq.c b/drivers/net/ice/base/ice_controlq.c index 3ef07e0943..80322e70d0 100644 --- a/drivers/net/ice/base/ice_controlq.c +++ b/drivers/net/ice/base/ice_controlq.c @@ -722,7 +722,7 @@ static void ice_shutdown_ctrlq(struct ice_hw *hw, enum ice_ctl_q q_type) */ void ice_shutdown_all_ctrlq(struct ice_hw *hw) { - ice_debug(hw, ICE_DBG_TRACE, "ice_shutdown_all_ctrlq\n"); + ice_debug(hw, ICE_DBG_TRACE, "%s\n", __func__); /* Shutdown FW admin queue */ ice_shutdown_ctrlq(hw, ICE_CTL_Q_ADMIN); /* Shutdown PF-VF Mailbox */ diff --git a/drivers/net/ice/base/ice_flex_pipe.c b/drivers/net/ice/base/ice_flex_pipe.c index 147fa4d018..afb8678779 100644 --- a/drivers/net/ice/base/ice_flex_pipe.c +++ b/drivers/net/ice/base/ice_flex_pipe.c @@ -706,7 +706,7 @@ ice_acquire_global_cfg_lock(struct ice_hw *hw, { enum ice_status status; - ice_debug(hw, ICE_DBG_TRACE, "ice_acquire_global_cfg_lock"); + ice_debug(hw, ICE_DBG_TRACE, "%s\n", __func__); status = ice_acquire_res(hw, ICE_GLOBAL_CFG_LOCK_RES_ID, access, ICE_GLOBAL_CFG_LOCK_TIMEOUT); @@ -739,7 +739,7 @@ static void ice_release_global_cfg_lock(struct ice_hw *hw) enum ice_status ice_acquire_change_lock(struct ice_hw *hw, enum ice_aq_res_access_type access) { - ice_debug(hw, ICE_DBG_TRACE, "ice_acquire_change_lock"); + ice_debug(hw, ICE_DBG_TRACE, "%s\n", __func__); return ice_acquire_res(hw, ICE_CHANGE_LOCK_RES_ID, access, ICE_CHANGE_LOCK_TIMEOUT); @@ -753,7 +753,7 @@ ice_acquire_change_lock(struct ice_hw *hw, enum ice_aq_res_access_type access) */ void ice_release_change_lock(struct ice_hw *hw) { - ice_debug(hw, ICE_DBG_TRACE, "ice_release_change_lock"); + ice_debug(hw, ICE_DBG_TRACE, "%s\n", __func__); ice_release_res(hw, ICE_CHANGE_LOCK_RES_ID); } @@ -779,7 +779,7 @@ ice_aq_download_pkg(struct ice_hw *hw, struct ice_buf_hdr *pkg_buf, struct ice_aq_desc desc; enum ice_status status; - ice_debug(hw, ICE_DBG_TRACE, "ice_aq_download_pkg"); + ice_debug(hw, ICE_DBG_TRACE, "%s\n", __func__); if (error_offset) *error_offset = 0; @@ -830,7 +830,7 @@ ice_aq_update_pkg(struct ice_hw *hw, struct ice_buf_hdr *pkg_buf, u16 buf_size, struct ice_aq_desc desc; enum ice_status status; - ice_debug(hw, ICE_DBG_TRACE, "ice_aq_update_pkg"); + ice_debug(hw, ICE_DBG_TRACE, "%s\n", __func__); if (error_offset) *error_offset = 0; @@ -1018,7 +1018,7 @@ ice_aq_get_pkg_info_list(struct ice_hw *hw, { struct ice_aq_desc desc; - ice_debug(hw, ICE_DBG_TRACE, "ice_aq_get_pkg_info_list"); + ice_debug(hw, ICE_DBG_TRACE, "%s\n", __func__); ice_fill_dflt_direct_cmd_desc(&desc, ice_aqc_opc_get_pkg_info_list); return ice_aq_send_cmd(hw, &desc, pkg_info, buf_size, cd); diff --git a/drivers/net/ice/base/ice_nvm.c b/drivers/net/ice/base/ice_nvm.c index 76cfedb298..6178cd4aca 100644 --- a/drivers/net/ice/base/ice_nvm.c +++ b/drivers/net/ice/base/ice_nvm.c @@ -202,7 +202,7 @@ read_nvm_buf_aq_exit: static enum ice_status ice_acquire_nvm(struct ice_hw *hw, enum ice_aq_res_access_type access) { - ice_debug(hw, ICE_DBG_TRACE, "ice_acquire_nvm\n"); + ice_debug(hw, ICE_DBG_TRACE, "%s\n", __func__); if (hw->nvm.blank_nvm_mode) return ICE_SUCCESS; @@ -218,7 +218,7 @@ ice_acquire_nvm(struct ice_hw *hw, enum ice_aq_res_access_type access) */ static void ice_release_nvm(struct ice_hw *hw) { - ice_debug(hw, ICE_DBG_TRACE, "ice_release_nvm\n"); + ice_debug(hw, ICE_DBG_TRACE, "%s\n", __func__); if (hw->nvm.blank_nvm_mode) return; -- 2.20.1