From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
To: davem@davemloft.net
Cc: Shannon Nelson <shannon.nelson@intel.com>,
netdev@vger.kernel.org, gospo@redhat.com, sassmann@redhat.com,
Jesse Brandeburg <jesse.brandeburg@intel.com>,
Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Subject: [net-next v2 05/16] i40e: fix curly brace use and return type
Date: Fri, 20 Dec 2013 08:45:54 -0800 [thread overview]
Message-ID: <1387557965-13241-6-git-send-email-jeffrey.t.kirsher@intel.com> (raw)
In-Reply-To: <1387557965-13241-1-git-send-email-jeffrey.t.kirsher@intel.com>
From: Shannon Nelson <shannon.nelson@intel.com>
Add curly-braces on a multi-line function. While we're here we
also change to return void in i40e_vsi_clear_rings() since no
caller cares.
Change-Id: I261fcef20e2a39e18d83ec08fdd14456131dee91
Signed-off-by: Shannon Nelson <shannon.nelson@intel.com>
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Tested-by: Kavindya Deegala <kavindya.s.deegala@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/ethernet/intel/i40e/i40e_main.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index 45b2198..b0cfb4c 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -5300,18 +5300,17 @@ free_vsi:
* i40e_vsi_clear_rings - Deallocates the Rx and Tx rings for the provided VSI
* @vsi: the VSI being cleaned
**/
-static s32 i40e_vsi_clear_rings(struct i40e_vsi *vsi)
+static void i40e_vsi_clear_rings(struct i40e_vsi *vsi)
{
int i;
- if (vsi->tx_rings[0])
+ if (vsi->tx_rings[0]) {
for (i = 0; i < vsi->num_queue_pairs; i++) {
kfree_rcu(vsi->tx_rings[i], rcu);
vsi->tx_rings[i] = NULL;
vsi->rx_rings[i] = NULL;
}
-
- return 0;
+ }
}
/**
--
1.8.3.1
next prev parent reply other threads:[~2013-12-20 16:48 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-20 16:45 [net-next v2 00/16][pull request] Intel Wired LAN Driver Updates Jeff Kirsher
2013-12-20 16:45 ` [net-next v2 01/16] i40e: using for_each_set_bit to simplify the code Jeff Kirsher
2013-12-20 16:45 ` [net-next v2 02/16] i40e: Suppress HMC error to Interrupt message level Jeff Kirsher
2013-12-20 16:45 ` [net-next v2 03/16] i40e: Populate and check pci bus speed and width Jeff Kirsher
2013-12-20 16:45 ` [net-next v2 04/16] i40e: add wake-on-lan support Jeff Kirsher
2013-12-20 16:45 ` Jeff Kirsher [this message]
2013-12-20 16:45 ` [net-next v2 06/16] i40e: Implementation of vxlan ndo's Jeff Kirsher
2013-12-20 16:45 ` [net-next v2 07/16] i40e: Rx checksum offload for VXLAN Jeff Kirsher
2013-12-20 16:45 ` [net-next v2 08/16] i40e: move i40e_reset_vf Jeff Kirsher
2013-12-20 16:45 ` [net-next v2 09/16] i40e: refactor VF reset flow Jeff Kirsher
2013-12-20 16:45 ` [net-next v2 10/16] i40e: remove redundant code Jeff Kirsher
2013-12-20 16:46 ` [net-next v2 11/16] i40e: remove chatty log messages Jeff Kirsher
2013-12-20 18:18 ` Sergei Shtylyov
2013-12-20 17:40 ` Williams, Mitch A
2013-12-20 17:59 ` Joe Perches
2013-12-20 18:00 ` Jeff Kirsher
2013-12-20 18:04 ` Williams, Mitch A
2013-12-20 18:31 ` Joe Perches
2013-12-20 18:00 ` Williams, Mitch A
2013-12-20 16:46 ` [net-next v2 12/16] i40e: fix error return Jeff Kirsher
2013-12-20 16:46 ` [net-next v2 13/16] i40e: be more informative Jeff Kirsher
2013-12-20 16:46 ` [net-next v2 14/16] i40e: make a define from a large constant Jeff Kirsher
2013-12-20 16:46 ` [net-next v2 15/16] i40e: update led set args Jeff Kirsher
2013-12-20 16:46 ` [net-next v2 16/16] i40e: report VF MAC addresses correctly Jeff Kirsher
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1387557965-13241-6-git-send-email-jeffrey.t.kirsher@intel.com \
--to=jeffrey.t.kirsher@intel.com \
--cc=davem@davemloft.net \
--cc=gospo@redhat.com \
--cc=jesse.brandeburg@intel.com \
--cc=netdev@vger.kernel.org \
--cc=sassmann@redhat.com \
--cc=shannon.nelson@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).