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,
sergei.shtylyov@cogentembedded.com,
Jesse Brandeburg <jesse.brandeburg@intel.com>,
Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Subject: [net-next v2 11/14] i40e: reorder block declarations in debugfs
Date: Tue, 22 Oct 2013 07:22:34 -0700 [thread overview]
Message-ID: <1382451757-9817-12-git-send-email-jeffrey.t.kirsher@intel.com> (raw)
In-Reply-To: <1382451757-9817-1-git-send-email-jeffrey.t.kirsher@intel.com>
From: Shannon Nelson <shannon.nelson@intel.com>
This is a cleanup of the local variables declared at the beginning
of each function.
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>
---
v2:
- Fixed patch description based on feedback from Sergei Shtylyov
---
drivers/net/ethernet/intel/i40e/i40e_debugfs.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/net/ethernet/intel/i40e/i40e_debugfs.c b/drivers/net/ethernet/intel/i40e/i40e_debugfs.c
index 387bf94..246b177 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_debugfs.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_debugfs.c
@@ -1147,9 +1147,9 @@ static ssize_t i40e_dbg_command_write(struct file *filp,
i40e_veb_release(pf->veb[i]);
} else if (strncmp(cmd_buf, "add macaddr", 11) == 0) {
- u8 ma[6];
- int vlan = 0;
struct i40e_mac_filter *f;
+ int vlan = 0;
+ u8 ma[6];
int ret;
cnt = sscanf(&cmd_buf[11],
@@ -1185,8 +1185,8 @@ static ssize_t i40e_dbg_command_write(struct file *filp,
ma, vlan, vsi_seid, f, ret);
} else if (strncmp(cmd_buf, "del macaddr", 11) == 0) {
- u8 ma[6];
int vlan = 0;
+ u8 ma[6];
int ret;
cnt = sscanf(&cmd_buf[11],
@@ -1222,9 +1222,9 @@ static ssize_t i40e_dbg_command_write(struct file *filp,
ma, vlan, vsi_seid, ret);
} else if (strncmp(cmd_buf, "add pvid", 8) == 0) {
- int v;
- u16 vid;
i40e_status ret;
+ u16 vid;
+ int v;
cnt = sscanf(&cmd_buf[8], "%i %u", &vsi_seid, &v);
if (cnt != 2) {
@@ -1535,10 +1535,10 @@ static ssize_t i40e_dbg_command_write(struct file *filp,
} else if ((strncmp(cmd_buf, "add fd_filter", 13) == 0) ||
(strncmp(cmd_buf, "rem fd_filter", 13) == 0)) {
struct i40e_fdir_data fd_data;
- int ret;
u16 packet_len, i, j = 0;
char *asc_packet;
bool add = false;
+ int ret;
asc_packet = kzalloc(I40E_FDIR_MAX_RAW_PACKET_LOOKUP,
GFP_KERNEL);
@@ -1626,9 +1626,9 @@ static ssize_t i40e_dbg_command_write(struct file *filp,
}
} else if (strncmp(&cmd_buf[5],
"get local", 9) == 0) {
+ u16 llen, rlen;
int ret, i;
u8 *buff;
- u16 llen, rlen;
buff = kzalloc(I40E_LLDPDU_SIZE, GFP_KERNEL);
if (!buff)
goto command_write_done;
@@ -1659,9 +1659,9 @@ static ssize_t i40e_dbg_command_write(struct file *filp,
kfree(buff);
buff = NULL;
} else if (strncmp(&cmd_buf[5], "get remote", 10) == 0) {
+ u16 llen, rlen;
int ret, i;
u8 *buff;
- u16 llen, rlen;
buff = kzalloc(I40E_LLDPDU_SIZE, GFP_KERNEL);
if (!buff)
goto command_write_done;
--
1.8.3.1
next prev parent reply other threads:[~2013-10-22 14:22 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-22 14:22 [net-next v2 00/14][pull request] Intel Wired LAN Driver Updates Jeff Kirsher
2013-10-22 14:22 ` [net-next v2 01/14] i40e: do not flush after re-enabling interrupts Jeff Kirsher
2013-10-22 14:22 ` [net-next v2 02/14] i40e: don't free nonexistent rings Jeff Kirsher
2013-10-22 14:22 ` [net-next v2 03/14] i40e: assign correct vector to VF Jeff Kirsher
2013-10-22 14:22 ` [net-next v2 04/14] i40e: fixup legacy interrupt handling Jeff Kirsher
2013-10-22 14:22 ` [net-next v2 05/14] i40e: debugfs fixups Jeff Kirsher
2013-10-22 14:22 ` [net-next v2 06/14] i40e: clamp debugfs nvm read command Jeff Kirsher
2013-10-22 14:22 ` [net-next v2 07/14] i40e: fix use of untrusted scalar value warning Jeff Kirsher
2013-10-22 14:22 ` [net-next v2 08/14] i40e: fix sign extension issue Jeff Kirsher
2013-10-22 14:22 ` [net-next v2 09/14] i40e: refactor fdir setup function Jeff Kirsher
2013-10-22 14:22 ` [net-next v2 10/14] i40e: tweaking icr0 handling for legacy irq Jeff Kirsher
2013-10-22 14:22 ` Jeff Kirsher [this message]
2013-10-22 14:22 ` [net-next v2 12/14] i40e: check vsi ptrs before dumping them Jeff Kirsher
2013-10-22 14:22 ` [net-next v2 13/14] i40e: use pf_id for pf function id in qtx_ctl Jeff Kirsher
2013-10-22 14:22 ` [net-next v2 14/14] i40e: Bump version Jeff Kirsher
2013-10-22 19:53 ` [net-next v2 00/14][pull request] Intel Wired LAN Driver Updates David Miller
2013-10-22 20:00 ` 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=1382451757-9817-12-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=sergei.shtylyov@cogentembedded.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).