x86/intel/quark: Fix simple_return.cocci warnings
authorFengguang Wu <fengguang.wu@intel.com>
Thu, 19 Feb 2015 08:14:32 +0000 (16:14 +0800)
committerIngo Molnar <mingo@kernel.org>
Thu, 19 Feb 2015 09:00:55 +0000 (10:00 +0100)
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@intel.com>
Cc: Andy Shevchenko <andy.schevchenko@gmail.com>
Cc: Ong, Boon Leong <boon.leong.ong@intel.com>
Cc: Bryan O'Donoghue <pure.logic@nexus-software.ie>
Cc: Darren Hart <dvhart@linux.intel.com>
Cc: kbuild-all@01.org
Link: http://lkml.kernel.org/r/20150219081432.GA21996@waimea
Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/platform/intel-quark/imr.c

index 60c01eb47dd6334dda7e838ed2270ffd0dc3791f..0ee619f9fcb725f73ad13b96c680fe97ad29bef0 100644 (file)
@@ -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;
 }
 
 /**