Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7429c0bd authored by Jacob Keller's avatar Jacob Keller Committed by Jeff Kirsher
Browse files

i40e: remove error_param_int label from i40e_vc_config_promiscuous_mode_msg 



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: default avatarJacob Keller <jacob.e.keller@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 06fc016c

drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c

+4 −3
Original line number Diff line number Diff line
@@ -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",