x86/mtrr: Use str_enabled_disabled() helper in print_mtrr_state()
PATCH RESEND 1/1 x86/mtrr: Use str_enabled_disabled() helper in print_mtrr_state()
Remove hard-coded strings by using the str_enabled_disabled() helper function.
Suggested-by Christophe JAILLET <[email protected]>
Signed-off-by Thorsten Blum <[email protected]>
--- arch/x86/kernel/cpu/mtrr/generic.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
arch/x86/kernel/cpu/mtrr/generic.c +7 -6
@@ -9,6 +9,7 @@#include <linux/io.h> #include <linux/mm.h> #include <linux/cc_platform.h> +#include <linux/string_choices.h> #include <asm/processor-flags.h> #include <asm/cacheinfo.h> #include <asm/cpufeature.h>
@@ -646,10 +647,10 @@ static void __init print_mtrr_state(void)pr_info ("MTRR default type: %s\n" ,mtrr_attrib_to_str (mtrr_state.def_type));if (mtrr_state.have_fixed) { -pr_info ("MTRR fixed ranges %sabled:\n" , - ((mtrr_state.enabled &MTRR_STATE_MTRR_ENABLED ) && - (mtrr_state.enabled &MTRR_STATE_MTRR_FIXED_ENABLED )) ? -"en" :"dis" ); +pr_info ("MTRR fixed ranges %s:\n" , +str_enabled_disabled ( + (mtrr_state.enabled &MTRR_STATE_MTRR_ENABLED ) && + (mtrr_state.enabled &MTRR_STATE_MTRR_FIXED_ENABLED )));print_fixed (0x00000 ,0x10000 , mtrr_state.fixed_ranges +0 );for (i =0 ; i <2 ; ++i) print_fixed(0x80000 + i * 0x20000, 0x04000,
@@ -661,8 +662,8 @@ static void __init print_mtrr_state(void)/* tail */ print_fixed_last (); } -pr_info ("MTRR variable ranges %sabled:\n" , - mtrr_state.enabled &MTRR_STATE_MTRR_ENABLED ?"en" :"dis" ); +pr_info ("MTRR variable ranges %s:\n" , +str_enabled_disabled (mtrr_state.enabled &MTRR_STATE_MTRR_ENABLED )); high_width = (boot_cpu_data.x86_phys_bits - (32 -PAGE_SHIFT ) +3 ) /4 ;for (i =0 ; i < num_var_ranges; ++i) {
Signature · 1 line
2.48.0
Quoted 2 lines · Thorsten Blum
Remove hard-coded strings by using the
str_enabled_disabled()helper function.
Hey Thorsten,
I'll throw this in the pile of things to apply after the merge window. This is a pretty simple one, but it's not like it fixes a bug or actually makes the code massively more understandable.
So if you're looking for a good time to send this kind of thing, I'd suggest as early as possible after an -rc1 drops.