[tip:x86/platform] x86/intel/quark: Fix simple_return.cocci warnings

From: tip-bot for Fengguang Wu
Date: Thu Feb 19 2015 - 06:32:14 EST

Commit-ID: c11a25f443e9bee06fe302b6a78ff44dac554036
Gitweb: http://git.kernel.org/tip/c11a25f443e9bee06fe302b6a78ff44dac554036
Author: Fengguang Wu <fengguang.wu@xxxxxxxxx>
AuthorDate: Thu, 19 Feb 2015 16:14:32 +0800
Committer: Ingo Molnar <mingo@xxxxxxxxxx>
CommitDate: Thu, 19 Feb 2015 10:00:55 +0100

x86/intel/quark: Fix simple_return.cocci warnings

arch/x86/platform/intel-quark/imr.c:129:1-4: WARNING: end returns can be simpified

Simplify a trivial if-return sequence. Possibly combine with a preceding function call.

Generated by: scripts/coccinelle/misc/simple_return.cocci

Signed-off-by: Fengguang Wu <fengguang.wu@xxxxxxxxx>
Cc: Andy Shevchenko <andy.schevchenko@xxxxxxxxx>
Cc: Ong, Boon Leong <boon.leong.ong@xxxxxxxxx>
Cc: Bryan O'Donoghue <pure.logic@xxxxxxxxxxxxxxxxx>
Cc: Darren Hart <dvhart@xxxxxxxxxxxxxxx>
Cc: kbuild-all@xxxxxx
Link: 20150219081432.GA21996@waimea">http://lkml.kernel.org/r/20150219081432.GA21996@waimea
Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx>
arch/x86/platform/intel-quark/imr.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/arch/x86/platform/intel-quark/imr.c b/arch/x86/platform/intel-quark/imr.c
index 60c01eb..0ee619f 100644
--- a/arch/x86/platform/intel-quark/imr.c
+++ b/arch/x86/platform/intel-quark/imr.c
@@ -126,12 +126,8 @@ static int imr_read(struct imr_device *idev, u32 imr_id, struct imr_regs *imr)
if (ret)
return ret;

- ret = iosf_mbi_read(QRK_MBI_UNIT_MM, QRK_MBI_MM_READ,
+ return iosf_mbi_read(QRK_MBI_UNIT_MM, QRK_MBI_MM_READ,
reg++, &imr->wmask);
- if (ret)
- return ret;
- return 0;

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/