linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] i40e: remove unneeded tests
@ 2015-05-26 20:26 Laurent Navet
  2015-05-27 16:31 ` Shannon Nelson
  0 siblings, 1 reply; 2+ messages in thread
From: Laurent Navet @ 2015-05-26 20:26 UTC (permalink / raw)
  To: jeffrey.t.kirsher, jesse.brandeburg, shannon.nelson,
	carolyn.wyborny, donald.c.skidmore, matthew.vick, john.ronciak,
	mitch.a.williams
  Cc: intel-wired-lan, netdev, linux-kernel, Laurent Navet

The same code is executed regardless ret_code value, so these tests can
be removed.
Fix Coverity CID 1268789 and 1268791

Signed-off-by: Laurent Navet <laurent.navet@gmail.com>
---
 drivers/net/ethernet/intel/i40e/i40e_hmc.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/drivers/net/ethernet/intel/i40e/i40e_hmc.c b/drivers/net/ethernet/intel/i40e/i40e_hmc.c
index 9b987cc..eae4248 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_hmc.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_hmc.c
@@ -298,8 +298,6 @@ i40e_status i40e_remove_sd_bp_new(struct i40e_hw *hw,
 		goto exit;
 	}
 	ret_code = i40e_free_dma_mem(hw, &(sd_entry->u.bp.addr));
-	if (ret_code)
-		goto exit;
 exit:
 	return ret_code;
 }
@@ -353,8 +351,6 @@ i40e_status i40e_remove_pd_page_new(struct i40e_hw *hw,
 	}
 	/* free memory here */
 	ret_code = i40e_free_dma_mem(hw, &(sd_entry->u.pd_table.pd_page_addr));
-	if (ret_code)
-		goto exit;
 exit:
 	return ret_code;
 }
-- 
2.1.4


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] i40e: remove unneeded tests
  2015-05-26 20:26 [PATCH] i40e: remove unneeded tests Laurent Navet
@ 2015-05-27 16:31 ` Shannon Nelson
  0 siblings, 0 replies; 2+ messages in thread
From: Shannon Nelson @ 2015-05-27 16:31 UTC (permalink / raw)
  To: Laurent Navet
  Cc: Jeff Kirsher, Jesse Brandeburg, carolyn.wyborny,
	donald.c.skidmore, matthew.vick, john.ronciak, mitch.a.williams,
	intel-wired-lan, netdev, linux-kernel

On Tue, May 26, 2015 at 1:26 PM, Laurent Navet <laurent.navet@gmail.com> wrote:
> The same code is executed regardless ret_code value, so these tests can
> be removed.
> Fix Coverity CID 1268789 and 1268791
>
> Signed-off-by: Laurent Navet <laurent.navet@gmail.com>
> ---
>  drivers/net/ethernet/intel/i40e/i40e_hmc.c | 4 ----
>  1 file changed, 4 deletions(-)
>
> diff --git a/drivers/net/ethernet/intel/i40e/i40e_hmc.c b/drivers/net/ethernet/intel/i40e/i40e_hmc.c
> index 9b987cc..eae4248 100644
> --- a/drivers/net/ethernet/intel/i40e/i40e_hmc.c
> +++ b/drivers/net/ethernet/intel/i40e/i40e_hmc.c
> @@ -298,8 +298,6 @@ i40e_status i40e_remove_sd_bp_new(struct i40e_hw *hw,
>                 goto exit;
>         }
>         ret_code = i40e_free_dma_mem(hw, &(sd_entry->u.bp.addr));
> -       if (ret_code)
> -               goto exit;
>  exit:
>         return ret_code;
>  }
> @@ -353,8 +351,6 @@ i40e_status i40e_remove_pd_page_new(struct i40e_hw *hw,
>         }
>         /* free memory here */
>         ret_code = i40e_free_dma_mem(hw, &(sd_entry->u.pd_table.pd_page_addr));
> -       if (ret_code)
> -               goto exit;
>  exit:
>         return ret_code;
>  }
> --

Thanks, Laurent, for noticing this.  You're right, this needs some
attention, but I think by rewriting these two functions a little we
can come up with an even better and simpler solution.  I'll be posting
a different patch soon.

sln

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2015-05-27 16:31 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-05-26 20:26 [PATCH] i40e: remove unneeded tests Laurent Navet
2015-05-27 16:31 ` Shannon Nelson

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).