hulk inclusion category: cleanup bugzilla: https://gitee.com/openeuler/kernel/issues/ID8IIO ----------------------------------------- This patch consolidates logging prefix definitions by introducing a single XSCHED_LOG_PREFIX ("XSched") and generating level-specific prefixes inline in the logging macros. The previous design duplicated prefix strings across XSCHED_INFO_PREFIX, XSCHED_ERR_PREFIX, XSCHED_WARN_PREFIX and XSCHED_DEBUG_PREFIX. The new format produces logs like: XSched [INFO]: ... XSched [ERROR]: ... XSched [WARNING]: ... XSched [DEBUG]: ... This reduces redundancy, avoids future inconsistencies when modifying prefixes, and keeps all level formatting aligned under a shared base prefix. Signed-off-by: Zicheng Qu <quzicheng@huawei.com> --- include/linux/xsched.h | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/include/linux/xsched.h b/include/linux/xsched.h index d97b3beae8ad..4ec8fdc64408 100644 --- a/include/linux/xsched.h +++ b/include/linux/xsched.h @@ -11,25 +11,22 @@ #define pr_fmt(fmt) fmt #endif -#define XSCHED_INFO_PREFIX "XSched [INFO]: " +#define XSCHED_LOG_PREFIX "XSched" #define XSCHED_INFO(fmt, ...) \ - pr_info(pr_fmt(XSCHED_INFO_PREFIX fmt), ##__VA_ARGS__) + pr_info(pr_fmt(XSCHED_LOG_PREFIX " [INFO]: " fmt), ##__VA_ARGS__) -#define XSCHED_ERR_PREFIX "XSched [ERROR]: " #define XSCHED_ERR(fmt, ...) \ - pr_err(pr_fmt(XSCHED_ERR_PREFIX fmt), ##__VA_ARGS__) + pr_err(pr_fmt(XSCHED_LOG_PREFIX " [ERROR]: " fmt), ##__VA_ARGS__) -#define XSCHED_WARN_PREFIX "XSched [WARNING]: " #define XSCHED_WARN(fmt, ...) \ - pr_warn(pr_fmt(XSCHED_WARN_PREFIX fmt), ##__VA_ARGS__) + pr_warn(pr_fmt(XSCHED_LOG_PREFIX " [WARNING]: " fmt), ##__VA_ARGS__) /* * Debug specific prints for XSched */ -#define XSCHED_DEBUG_PREFIX "XSched [DEBUG]: " #define XSCHED_DEBUG(fmt, ...) \ - pr_debug(pr_fmt(XSCHED_DEBUG_PREFIX fmt), ##__VA_ARGS__) + pr_debug(pr_fmt(XSCHED_LOG_PREFIX " [DEBUG]: " fmt), ##__VA_ARGS__) #define XSCHED_CALL_STUB() \ XSCHED_DEBUG(" -----* %s @ %s called *-----\n", __func__, __FILE__) -- 2.34.1