[Intel-wired-lan] [jkirsher-next-queue:dev-queue 127/128] drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c:153:1-7: WARNING: end returns can be simpified

[Intel-wired-lan] [jkirsher-next-queue:dev-queue 127/128] drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c:153:1-7: WARNING: end returns can be simpified

[kbuild test robot]

tree:   git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue.git dev-queue
head:   246db26b0ce1ae0eb1cf19195155a2e02ad3d257
commit: 3c7e68b9d8870417bce21f7ae21cfe74828f974f [127/128] ixgbe: Add logic to reset CS4227 when needed


coccinelle warnings: (new ones prefixed by >>)

>> drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c:153:1-7: WARNING: end returns can be simpified

Please review and possibly fold the followup patch.

---
0-DAY kernel test infrastructure                Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all                   Intel Corporation

[Intel-wired-lan] [PATCH] ixgbe: fix simple_return.cocci warnings

[kbuild test robot]

drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c:153:1-7: 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

CC: Mark Rustad <mark.d.rustad@intel.com>
Signed-off-by: Fengguang Wu <fengguang.wu@intel.com>
---

 ixgbe_x550.c |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c
@@ -150,12 +150,8 @@ static s32 ixgbe_get_cs4227_status(struc
 	if (status)
 		return status;
 
-	status = ixgbe_check_cs4227_reg(hw, IXGBE_CS4227_HOST_SPARE24_LSB +
+	return ixgbe_check_cs4227_reg(hw, IXGBE_CS4227_HOST_SPARE24_LSB +
 					(1 << 12));
-	if (status)
-		return status;
-
-	return 0;
 }
 
 /**

[Intel-wired-lan] [PATCH] ixgbe: fix simple_return.cocci warnings

[Rustad, Mark D]

> On Jul 29, 2015, at 12:11 AM, Wu, Fengguang <fengguang.wu@intel.com> wrote:
> 
> drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c:153:1-7: 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
> 
> CC: Mark Rustad <mark.d.rustad@intel.com>
> Signed-off-by: Fengguang Wu <fengguang.wu@intel.com>
> ---
> 
> ixgbe_x550.c |    6 +-----
> 1 file changed, 1 insertion(+), 5 deletions(-)
> 
> --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c
> +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c
> @@ -150,12 +150,8 @@ static s32 ixgbe_get_cs4227_status(struc
> 	if (status)
> 		return status;
> 
> -	status = ixgbe_check_cs4227_reg(hw, IXGBE_CS4227_HOST_SPARE24_LSB +
> +	return ixgbe_check_cs4227_reg(hw, IXGBE_CS4227_HOST_SPARE24_LSB +
> 					(1 << 12));
> -	if (status)
> -		return status;
> -
> -	return 0;
> }
> 
> /**

Please don't apply this as-is. It will introduce an indentation error that checkpatch will complain about. I can either respin the series to incorporate this, or this patch can be changed to adjust the indentation. Whichever you prefer.

--
Mark Rustad, Networking Division, Intel Corporation

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 841 bytes
Desc: Message signed with OpenPGP using GPGMail
URL: <http://lists.osuosl.org/pipermail/intel-wired-lan/attachments/20150729/142f57fd/attachment.asc>