i40e: remove error_param_int label from i40e_vc_config_promiscuous_mode_msg

Orabug: 24568124

This label is unnecessary, as are jumping to a block that checks aq_ret
and then immediately skipping it and returning. So just jump straight to
the error_param and remove this unnecessary label.

Also use goto error_param even in the last check for style consistency.

Change-ID: If487c7d10c4048e37c594e5eca167693aaed45f6
Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
(cherry picked from commit 7429c0bd0155c73e0c6ec8f16e440735209d24a5)
Signed-off-by: Brian Maly <brian.maly@oracle.com>
Signed-off-by: Dhaval Giani <dhaval.giani@oracle.com>

diff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
index ad0ccf38ee8253e2457eec31f03a3486f3466133..c902c84d5c465f25018c0bd73270e9cbdfe6c68d 100644 (file)
--- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
@@ -1536,7 +1536,7 @@ static int i40e_vc_config_promiscuous_mode_msg(struct i40e_vf *vf,
                                vf->vf_id,
                                i40e_stat_str(&pf->hw, aq_ret),
                                i40e_aq_str(&pf->hw, aq_err));
-                       goto error_param_int;
+                       goto error_param;
                }
        }
 
@@ -1581,15 +1581,16 @@ static int i40e_vc_config_promiscuous_mode_msg(struct i40e_vf *vf,
                                                             allmulti, NULL,
                                                             true);
                aq_err = pf->hw.aq.asq_last_status;
-               if (aq_ret)
+               if (aq_ret) {
                        dev_err(&pf->pdev->dev,
                                "VF %d failed to set unicast promiscuous mode %8.8x err %s aq_err %s\n",
                                vf->vf_id, info->flags,
                                i40e_stat_str(&pf->hw, aq_ret),
                                i40e_aq_str(&pf->hw, aq_err));
+                       goto error_param;
+               }
        }
 
-error_param_int:
        if (!aq_ret) {
                dev_info(&pf->pdev->dev,
                         "VF %d successfully set unicast promiscuous mode\n",