From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
To: davem@davemloft.net
Cc: Jesse Brandeburg <jesse.brandeburg@intel.com>,
netdev@vger.kernel.org, nhorman@redhat.com, sassmann@redhat.com,
jogreene@redhat.com, Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Subject: [net-next 15/16] i40e: trivial: remove unnecessary local var
Date: Tue, 16 Feb 2016 21:34:21 -0800 [thread overview]
Message-ID: <1455687262-20453-16-git-send-email-jeffrey.t.kirsher@intel.com> (raw)
In-Reply-To: <1455687262-20453-1-git-send-email-jeffrey.t.kirsher@intel.com>
From: Jesse Brandeburg <jesse.brandeburg@intel.com>
Probe routine already has too many locals, just convert one
used for kzalloc into a kcalloc, eliminating the local.
Change-ID: I349049872b71f858cbeb91ad7836e6767fc7b7d1
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Reviewed-by: Anjali Singhai <anjali.singhai@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/ethernet/intel/i40e/i40e_main.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index 7323e32..a2643fe 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -10637,7 +10637,6 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
u16 wol_nvm_bits;
u16 link_status;
int err;
- u32 len;
u32 val;
u32 i;
u8 set_fc_aq_fail;
@@ -10896,8 +10895,8 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
pf->num_alloc_vsi = pf->hw.func_caps.num_vsis;
/* Set up the *vsi struct and our local tracking of the MAIN PF vsi. */
- len = sizeof(struct i40e_vsi *) * pf->num_alloc_vsi;
- pf->vsi = kzalloc(len, GFP_KERNEL);
+ pf->vsi = kcalloc(pf->num_alloc_vsi, sizeof(struct i40e_vsi *),
+ GFP_KERNEL);
if (!pf->vsi) {
err = -ENOMEM;
goto err_switch_setup;
--
2.5.0
next prev parent reply other threads:[~2016-02-17 5:34 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-17 5:34 [net-next 00/16][pull request] 40GbE Intel Wired LAN Driver Updates 2016-02-16 Jeff Kirsher
2016-02-17 5:34 ` [net-next 01/16] i40e: AQ Shared resource flags Jeff Kirsher
2016-02-17 5:34 ` [net-next 02/16] i40e: AQ Add set_switch_config Jeff Kirsher
2016-02-17 5:34 ` [net-next 03/16] i40e: AQ Add VXLAN-GPE tunnel type Jeff Kirsher
2016-02-17 5:34 ` [net-next 04/16] i40e: AQ thermal sensor control struct Jeff Kirsher
2016-02-17 5:34 ` [net-next 05/16] i40e: Bump AQ minor version to 1.5 for new FW features Jeff Kirsher
2016-02-17 5:34 ` [net-next 06/16] i40e: Store lan_vsi_idx and lan_vsi_id in the right size Jeff Kirsher
2016-02-17 5:34 ` [net-next 07/16] i40e: fix write-back-on-itr to work with legacy itr Jeff Kirsher
2016-02-17 5:34 ` [net-next 08/16] i40e: add counter for arq overflows Jeff Kirsher
2016-02-17 5:34 ` [net-next 09/16] i40e: add 20G speed for Tx bandwidth calculations Jeff Kirsher
2016-02-17 5:34 ` [net-next 10/16] i40e: refactor DCB function Jeff Kirsher
2016-02-17 5:34 ` [net-next 11/16] i40e: add a little more to an NVM update debug message Jeff Kirsher
2016-02-17 5:34 ` [net-next 12/16] i40evf: enable bus master after reset Jeff Kirsher
2016-02-17 5:34 ` [net-next 13/16] i40e: add netdev info to VSI dump Jeff Kirsher
2016-02-17 5:34 ` [net-next 14/16] i40e: remove VF device IDs from PF Jeff Kirsher
2016-02-17 5:34 ` Jeff Kirsher [this message]
2016-02-17 5:34 ` [net-next 16/16] i40e/i40evf: Bump i40e to 1.4.11 and i40evf to 1.4.7 Jeff Kirsher
2016-02-17 14:49 ` [net-next 00/16][pull request] 40GbE Intel Wired LAN Driver Updates 2016-02-16 David Miller
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=1455687262-20453-16-git-send-email-jeffrey.t.kirsher@intel.com \
--to=jeffrey.t.kirsher@intel.com \
--cc=davem@davemloft.net \
--cc=jesse.brandeburg@intel.com \
--cc=jogreene@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=nhorman@redhat.com \
--cc=sassmann@redhat.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).