Remove unecessary ret variable in cpu_show_common.
Break up long lines too to make the code more concise
and easier to read and modify in later patches.
Signed-off-by: Tim Chen <tim.c.c...@linux.intel.com>
---
arch/x86/kernel/cpu/bugs.c | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c
index bbda9b6..b2f6b8b 100644
--- a/arch/x86/kernel/cpu/bugs.c
+++ b/arch/x86/kernel/cpu/bugs.c
@@ -854,8 +854,6 @@ static ssize_t l1tf_show_state(char *buf)
static ssize_t cpu_show_common(struct device *dev, struct device_attribute
*attr,
char *buf, unsigned int bug)
{
- int ret;
-
if (!boot_cpu_has_bug(bug))
return sprintf(buf, "Not affected\n");
@@ -873,13 +871,17 @@ static ssize_t cpu_show_common(struct device *dev, struct
device_attribute *attr
return sprintf(buf, "Mitigation: __user pointer
sanitization\n");
case X86_BUG_SPECTRE_V2:
- ret = sprintf(buf, "%s%s%s%s%s%s\n",
spectre_v2_strings[spectre_v2_enabled],
- boot_cpu_has(X86_FEATURE_USE_IBPB) ? ", IBPB" :
"",
- boot_cpu_has(X86_FEATURE_USE_IBRS_FW) ? ",
IBRS_FW" : "",
- (x86_spec_ctrl_base & SPEC_CTRL_STIBP) ? ",
STIBP" : "",
- boot_cpu_has(X86_FEATURE_RSB_CTXSW) ? ", RSB
filling" : "",
- spectre_v2_module_string());
- return ret;
+ return sprintf(buf, "%s%s%s%s%s%s\n",
+ spectre_v2_strings[spectre_v2_enabled],
+ boot_cpu_has(X86_FEATURE_USE_IBPB) ?
+ ", IBPB" : "",
+ boot_cpu_has(X86_FEATURE_USE_IBRS_FW) ?
+ ", IBRS_FW" : "",
+ (x86_spec_ctrl_base & SPEC_CTRL_STIBP) ?
+ ", STIBP" : "",
+ boot_cpu_has(X86_FEATURE_RSB_CTXSW) ?
+ ", RSB filling" : "",
+ spectre_v2_module_string());
case X86_BUG_SPEC_STORE_BYPASS:
return sprintf(buf, "%s\n", ssb_strings[ssb_mode]);
--
2.9.4
