diff mbox

[dpdk-dev,6/7] ixgbe: remove useless return

Message ID 20170109233022.31154-7-stephen@networkplumber.org (mailing list archive)
State Changes Requested, archived
Delegated to: Thomas Monjalon
Headers

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel compilation success Compilation OK

Commit Message

Stephen Hemminger Jan. 9, 2017, 11:30 p.m. UTC 
  If all goto's lead to a return, then better to get rid of goto.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
 drivers/net/ixgbe/ixgbe_82599_bypass.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

Comments

Ananyev, Konstantin Feb. 1, 2017, 4:40 p.m. UTC | #1 
> -----Original Message-----
> From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Stephen Hemminger
> Sent: Monday, January 9, 2017 11:30 PM
> To: dev@dpdk.org
> Cc: Stephen Hemminger <stephen@networkplumber.org>
> Subject: [dpdk-dev] [PATCH 6/7] ixgbe: remove useless return
> 
> If all goto's lead to a return, then better to get rid of goto.
> 
> Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
> ---
>  drivers/net/ixgbe/ixgbe_82599_bypass.c | 10 ++++------
>  1 file changed, 4 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/net/ixgbe/ixgbe_82599_bypass.c b/drivers/net/ixgbe/ixgbe_82599_bypass.c
> index de9fa5a7..af55cc0a 100644
> --- a/drivers/net/ixgbe/ixgbe_82599_bypass.c
> +++ b/drivers/net/ixgbe/ixgbe_82599_bypass.c
> @@ -73,7 +73,7 @@ ixgbe_set_fiber_fixed_speed(struct ixgbe_hw *hw, ixgbe_link_speed speed)
>  					   &eeprom_data);
>  	if (status) {
>  		PMD_DRV_LOG(ERR, "Failed to read Rx Rate Select RS0");
> -		goto out;
> +		return;
>  	}
> 
>  	eeprom_data = (eeprom_data & ~IXGBE_SFF_SOFT_RS_SELECT_MASK) & rs;
> @@ -83,7 +83,7 @@ ixgbe_set_fiber_fixed_speed(struct ixgbe_hw *hw, ixgbe_link_speed speed)
>  					    eeprom_data);
>  	if (status) {
>  		PMD_DRV_LOG(ERR, "Failed to write Rx Rate Select RS0");
> -		goto out;
> +		return;
>  	}
> 
>  	/* Set RS1 */
> @@ -92,7 +92,7 @@ ixgbe_set_fiber_fixed_speed(struct ixgbe_hw *hw, ixgbe_link_speed speed)
>  					   &eeprom_data);
>  	if (status) {
>  		PMD_DRV_LOG(ERR, "Failed to read Rx Rate Select RS1");
> -		goto out;
> +		return;
>  	}
> 
>  	eeprom_data = (eeprom_data & ~IXGBE_SFF_SOFT_RS_SELECT_MASK) & rs;
> @@ -102,10 +102,8 @@ ixgbe_set_fiber_fixed_speed(struct ixgbe_hw *hw, ixgbe_link_speed speed)
>  					    eeprom_data);
>  	if (status) {
>  		PMD_DRV_LOG(ERR, "Failed to write Rx Rate Select RS1");
> -		goto out;
> +		return;
>  	}
> -out:
> -	return;
>  }
> 
>  /**
> --

Acked-by: Konstantin Ananyev <konstantin.ananyev@intel.com>

> 2.11.0
Wei Dai Feb. 8, 2017, 2:43 p.m. UTC | #2 
> -----Original Message-----
> From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Ananyev, Konstantin
> Sent: Thursday, February 2, 2017 12:41 AM
> To: Stephen Hemminger <stephen@networkplumber.org>; dev@dpdk.org
> Subject: Re: [dpdk-dev] [PATCH 6/7] ixgbe: remove useless return
Subject line had better be net/ixgbe: remove useless return
> 
> 
> 
> > -----Original Message-----
> > From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Stephen Hemminger
> > Sent: Monday, January 9, 2017 11:30 PM
> > To: dev@dpdk.org
> > Cc: Stephen Hemminger <stephen@networkplumber.org>
> > Subject: [dpdk-dev] [PATCH 6/7] ixgbe: remove useless return
> >
> > If all goto's lead to a return, then better to get rid of goto.
> >
> > Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
> > ---
> >  drivers/net/ixgbe/ixgbe_82599_bypass.c | 10 ++++------
> >  1 file changed, 4 insertions(+), 6 deletions(-)
> >
> > diff --git a/drivers/net/ixgbe/ixgbe_82599_bypass.c
> > b/drivers/net/ixgbe/ixgbe_82599_bypass.c
> > index de9fa5a7..af55cc0a 100644
> > --- a/drivers/net/ixgbe/ixgbe_82599_bypass.c
> > +++ b/drivers/net/ixgbe/ixgbe_82599_bypass.c
> > @@ -73,7 +73,7 @@ ixgbe_set_fiber_fixed_speed(struct ixgbe_hw *hw,
> ixgbe_link_speed speed)
> >  					   &eeprom_data);
> >  	if (status) {
> >  		PMD_DRV_LOG(ERR, "Failed to read Rx Rate Select RS0");
> > -		goto out;
> > +		return;
> >  	}
> >
> >  	eeprom_data = (eeprom_data & ~IXGBE_SFF_SOFT_RS_SELECT_MASK) &
> rs;
> > @@ -83,7 +83,7 @@ ixgbe_set_fiber_fixed_speed(struct ixgbe_hw *hw,
> ixgbe_link_speed speed)
> >  					    eeprom_data);
> >  	if (status) {
> >  		PMD_DRV_LOG(ERR, "Failed to write Rx Rate Select RS0");
> > -		goto out;
> > +		return;
> >  	}
> >
> >  	/* Set RS1 */
> > @@ -92,7 +92,7 @@ ixgbe_set_fiber_fixed_speed(struct ixgbe_hw *hw,
> ixgbe_link_speed speed)
> >  					   &eeprom_data);
> >  	if (status) {
> >  		PMD_DRV_LOG(ERR, "Failed to read Rx Rate Select RS1");
> > -		goto out;
> > +		return;
> >  	}
> >
> >  	eeprom_data = (eeprom_data & ~IXGBE_SFF_SOFT_RS_SELECT_MASK) &
> rs;
> > @@ -102,10 +102,8 @@ ixgbe_set_fiber_fixed_speed(struct ixgbe_hw *hw,
> ixgbe_link_speed speed)
> >  					    eeprom_data);
> >  	if (status) {
> >  		PMD_DRV_LOG(ERR, "Failed to write Rx Rate Select RS1");
> > -		goto out;
> > +		return;
This return is also not needed. :-)
> >  	}
> > -out:
> > -	return;
> >  }
> >
> >  /**
> > --
> 
> Acked-by: Konstantin Ananyev <konstantin.ananyev@intel.com>
Acked-by: Wei Dai <wei.dai@intel.com>
> 
> > 2.11.0
diff mbox

Patch

diff --git a/drivers/net/ixgbe/ixgbe_82599_bypass.c b/drivers/net/ixgbe/ixgbe_82599_bypass.c
index de9fa5a7..af55cc0a 100644
--- a/drivers/net/ixgbe/ixgbe_82599_bypass.c
+++ b/drivers/net/ixgbe/ixgbe_82599_bypass.c
@@ -73,7 +73,7 @@  ixgbe_set_fiber_fixed_speed(struct ixgbe_hw *hw, ixgbe_link_speed speed)
 					   &eeprom_data);
 	if (status) {
 		PMD_DRV_LOG(ERR, "Failed to read Rx Rate Select RS0");
-		goto out;
+		return;
 	}
 
 	eeprom_data = (eeprom_data & ~IXGBE_SFF_SOFT_RS_SELECT_MASK) & rs;
@@ -83,7 +83,7 @@  ixgbe_set_fiber_fixed_speed(struct ixgbe_hw *hw, ixgbe_link_speed speed)
 					    eeprom_data);
 	if (status) {
 		PMD_DRV_LOG(ERR, "Failed to write Rx Rate Select RS0");
-		goto out;
+		return;
 	}
 
 	/* Set RS1 */
@@ -92,7 +92,7 @@  ixgbe_set_fiber_fixed_speed(struct ixgbe_hw *hw, ixgbe_link_speed speed)
 					   &eeprom_data);
 	if (status) {
 		PMD_DRV_LOG(ERR, "Failed to read Rx Rate Select RS1");
-		goto out;
+		return;
 	}
 
 	eeprom_data = (eeprom_data & ~IXGBE_SFF_SOFT_RS_SELECT_MASK) & rs;
@@ -102,10 +102,8 @@  ixgbe_set_fiber_fixed_speed(struct ixgbe_hw *hw, ixgbe_link_speed speed)
 					    eeprom_data);
 	if (status) {
 		PMD_DRV_LOG(ERR, "Failed to write Rx Rate Select RS1");
-		goto out;
+		return;
 	}
-out:
-	return;
 }
 
 /**