[tip:x86/cache] x86/intel_rdt: Remove redundant ternary operator on return

From: tip-bot for Colin Ian King
Date: Wed Aug 16 2017 - 10:27:13 EST


Commit-ID: 5707b46a4206be2068444eb6b514a1ee070651c8
Gitweb: http://git.kernel.org/tip/5707b46a4206be2068444eb6b514a1ee070651c8
Author: Colin Ian King <colin.king@xxxxxxxxxxxxx>
AuthorDate: Tue, 8 Aug 2017 10:28:59 +0100
Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
CommitDate: Wed, 16 Aug 2017 16:20:55 +0200

x86/intel_rdt: Remove redundant ternary operator on return

The use of the ternary operator is redundant as ret can never be
non-zero at that point. Instead, just return nbytes.

Detected by CoverityScan, CID#1452658 ("Logically dead code")

Signed-off-by: Colin Ian King <colin.king@xxxxxxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Vikas Shivappa <vikas.shivappa@xxxxxxxxxxxxxxx>
Cc: Fenghua Yu <fenghua.yu@xxxxxxxxx>
Cc: kernel-janitors@xxxxxxxxxxxxxxx
Link: http://lkml.kernel.org/r/20170808092859.13021-1-colin.king@xxxxxxxxxxxxx
---
arch/x86/kernel/cpu/intel_rdt_rdtgroup.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/kernel/cpu/intel_rdt_rdtgroup.c b/arch/x86/kernel/cpu/intel_rdt_rdtgroup.c
index b529f93..a869d4a 100644
--- a/arch/x86/kernel/cpu/intel_rdt_rdtgroup.c
+++ b/arch/x86/kernel/cpu/intel_rdt_rdtgroup.c
@@ -680,7 +680,7 @@ static ssize_t max_threshold_occ_write(struct kernfs_open_file *of,

intel_cqm_threshold = bytes / r->mon_scale;

- return ret ?: nbytes;
+ return nbytes;
}

/* rdtgroup information files for one cache resource. */