]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
i40e: simplify pointer dereferences
authorMitch Williams <mitch.a.williams@intel.com>
Mon, 18 Dec 2017 10:18:02 +0000 (05:18 -0500)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Tue, 23 Jan 2018 19:29:19 +0000 (11:29 -0800)
Now that i40e_vsi_config_tc() has the pf and hw variable defined, use
them, instead of dereferencing vsi->back. Much easier to read.

Signed-off-by: Mitch Williams <mitch.a.williams@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

index d66470d75601f6e7d43dd8a90ed73b7fb47dc752..ddf489f267d1dffaa1eeff11e5028ef2389ba977 100644 (file)
@@ -5265,7 +5265,7 @@ static int i40e_vsi_config_tc(struct i40e_vsi *vsi, u8 enabled_tc)
        if (ret) {
                struct i40e_aqc_query_vsi_bw_config_resp bw_config = {0};
 
-               dev_info(&vsi->back->pdev->dev,
+               dev_info(&pf->pdev->dev,
                         "Failed configuring TC map %d for VSI %d\n",
                         enabled_tc, vsi->seid);
                ret = i40e_aq_query_vsi_bw_config(hw, vsi->seid,
@@ -5336,13 +5336,12 @@ static int i40e_vsi_config_tc(struct i40e_vsi *vsi, u8 enabled_tc)
        /* Update the VSI after updating the VSI queue-mapping
         * information
         */
-       ret = i40e_aq_update_vsi_params(&vsi->back->hw, &ctxt, NULL);
+       ret = i40e_aq_update_vsi_params(hw, &ctxt, NULL);
        if (ret) {
-               dev_info(&vsi->back->pdev->dev,
+               dev_info(&pf->pdev->dev,
                         "Update vsi tc config failed, err %s aq_err %s\n",
-                        i40e_stat_str(&vsi->back->hw, ret),
-                        i40e_aq_str(&vsi->back->hw,
-                                    vsi->back->hw.aq.asq_last_status));
+                        i40e_stat_str(hw, ret),
+                        i40e_aq_str(hw, hw->aq.asq_last_status));
                goto out;
        }
        /* update the local VSI info with updated queue map */
@@ -5352,11 +5351,10 @@ static int i40e_vsi_config_tc(struct i40e_vsi *vsi, u8 enabled_tc)
        /* Update current VSI BW information */
        ret = i40e_vsi_get_bw_info(vsi);
        if (ret) {
-               dev_info(&vsi->back->pdev->dev,
+               dev_info(&pf->pdev->dev,
                         "Failed updating vsi bw info, err %s aq_err %s\n",
-                        i40e_stat_str(&vsi->back->hw, ret),
-                        i40e_aq_str(&vsi->back->hw,
-                                    vsi->back->hw.aq.asq_last_status));
+                        i40e_stat_str(hw, ret),
+                        i40e_aq_str(hw, hw->aq.asq_last_status));
                goto out;
        }