diff options
author | Shannon Nelson <shannon.nelson@intel.com> | 2014-05-20 04:01:38 -0400 |
---|---|---|
committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2014-06-09 02:19:54 -0400 |
commit | 3146ce3d4da6bd8f5541c551a84719069bc9166e (patch) | |
tree | b9979cf872daebd48a8f9f908049eb436b418a48 | |
parent | 505682cd7baba79b52f6c9df49224307fb6d34ef (diff) |
i40e: remove unused variable and memory allocation
This was a vestige of early driver development that no longer
has any actual use.
Change-ID: I95b5b19c4bbfaff8759197af671ebaf716cb6ab5
Signed-off-by: Shannon Nelson <shannon.nelson@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
-rw-r--r-- | drivers/net/ethernet/intel/i40e/i40e.h | 1 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/i40e/i40e_main.c | 10 |
2 files changed, 0 insertions, 11 deletions
diff --git a/drivers/net/ethernet/intel/i40e/i40e.h b/drivers/net/ethernet/intel/i40e/i40e.h index ebeaf95b9521..2af28fd37bff 100644 --- a/drivers/net/ethernet/intel/i40e/i40e.h +++ b/drivers/net/ethernet/intel/i40e/i40e.h | |||
@@ -297,7 +297,6 @@ struct i40e_pf { | |||
297 | u16 pf_seid; | 297 | u16 pf_seid; |
298 | u16 main_vsi_seid; | 298 | u16 main_vsi_seid; |
299 | u16 mac_seid; | 299 | u16 mac_seid; |
300 | struct i40e_aqc_get_switch_config_data *sw_config; | ||
301 | struct kobject *switch_kobj; | 300 | struct kobject *switch_kobj; |
302 | #ifdef CONFIG_DEBUG_FS | 301 | #ifdef CONFIG_DEBUG_FS |
303 | struct dentry *i40e_dbg_pf; | 302 | struct dentry *i40e_dbg_pf; |
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c index d9a6c692f150..4ba519281010 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_main.c +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c | |||
@@ -7990,15 +7990,6 @@ int i40e_fetch_switch_configuration(struct i40e_pf *pf, bool printconfig) | |||
7990 | "header: %d reported %d total\n", | 7990 | "header: %d reported %d total\n", |
7991 | num_reported, num_total); | 7991 | num_reported, num_total); |
7992 | 7992 | ||
7993 | if (num_reported) { | ||
7994 | int sz = sizeof(*sw_config) * num_reported; | ||
7995 | |||
7996 | kfree(pf->sw_config); | ||
7997 | pf->sw_config = kzalloc(sz, GFP_KERNEL); | ||
7998 | if (pf->sw_config) | ||
7999 | memcpy(pf->sw_config, sw_config, sz); | ||
8000 | } | ||
8001 | |||
8002 | for (i = 0; i < num_reported; i++) { | 7993 | for (i = 0; i < num_reported; i++) { |
8003 | struct i40e_aqc_switch_config_element_resp *ele = | 7994 | struct i40e_aqc_switch_config_element_resp *ele = |
8004 | &sw_config->element[i]; | 7995 | &sw_config->element[i]; |
@@ -8718,7 +8709,6 @@ static void i40e_remove(struct pci_dev *pdev) | |||
8718 | 8709 | ||
8719 | kfree(pf->qp_pile); | 8710 | kfree(pf->qp_pile); |
8720 | kfree(pf->irq_pile); | 8711 | kfree(pf->irq_pile); |
8721 | kfree(pf->sw_config); | ||
8722 | kfree(pf->vsi); | 8712 | kfree(pf->vsi); |
8723 | 8713 | ||
8724 | /* force a PF reset to clean anything leftover */ | 8714 | /* force a PF reset to clean anything leftover */ |