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 <[email protected]>
Signed-off-by: Jeff Kirsher <[email protected]>

diff --git a/drivers/net/ethernet/intel/i40e/i40e.h b/drivers/net/ethernet/intel/i40e/i40e.h
index ebeaf95b9521f515fcf64e5d8bafa9d266511bd2..2af28fd37bff4c8003774d467b5e83e54ce9b084 100644 (file)
--- a/drivers/net/ethernet/intel/i40e/i40e.h
+++ b/drivers/net/ethernet/intel/i40e/i40e.h
@@ -297,7 +297,6 @@ struct i40e_pf {
        u16 pf_seid;
        u16 main_vsi_seid;
        u16 mac_seid;
-       struct i40e_aqc_get_switch_config_data *sw_config;
        struct kobject *switch_kobj;
 #ifdef CONFIG_DEBUG_FS
        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 d9a6c692f15051da7d86d1fee5a137004ad57616..4ba519281010ce04d851026c740ce869be548dc7 100644 (file)
--- 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)
                                 "header: %d reported %d total\n",
                                 num_reported, num_total);
 
-               if (num_reported) {
-                       int sz = sizeof(*sw_config) * num_reported;
-
-                       kfree(pf->sw_config);
-                       pf->sw_config = kzalloc(sz, GFP_KERNEL);
-                       if (pf->sw_config)
-                               memcpy(pf->sw_config, sw_config, sz);
-               }
-
                for (i = 0; i < num_reported; i++) {
                        struct i40e_aqc_switch_config_element_resp *ele =
                                &sw_config->element[i];
@@ -8718,7 +8709,6 @@ static void i40e_remove(struct pci_dev *pdev)
 
        kfree(pf->qp_pile);
        kfree(pf->irq_pile);
-       kfree(pf->sw_config);
        kfree(pf->vsi);
 
        /* force a PF reset to clean anything leftover */