Commit 5d968af2 authored by Jan Sokolowski's avatar Jan Sokolowski Committed by Tony Nguyen
Browse files

i40e: Remove string printing for i40e_status 



Remove the i40e_stat_str() function which prints the string
representation of the i40e_status error code. With upcoming changes
moving away from i40e_status, there will be no need for this function

Signed-off-by: default avatarJan Sokolowski <jan.sokolowski@intel.com>
Tested-by: Gurucharan G <gurucharanx.g@intel.com> (A Contingent worker at Intel)
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 9d135352

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

+4 −4
Original line number Diff line number Diff line
@@ -686,8 +686,8 @@ static int i40e_client_update_vsi_ctxt(struct i40e_info *ldev, 
	ctxt.flags = I40E_AQ_VSI_TYPE_PF;

	if (err) {

		dev_info(&pf->pdev->dev,

			 "couldn't get PF vsi config, err %s aq_err %s\n",

			 i40e_stat_str(&pf->hw, err),

			 "couldn't get PF vsi config, err %d aq_err %s\n",

			 err,

			 i40e_aq_str(&pf->hw,

				     pf->hw.aq.asq_last_status));

		return -ENOENT;
@@ -714,8 +714,8 @@ static int i40e_client_update_vsi_ctxt(struct i40e_info *ldev, 
		err = i40e_aq_update_vsi_params(&vsi->back->hw, &ctxt, NULL);

		if (err) {

			dev_info(&pf->pdev->dev,

				 "update VSI ctxt for PE failed, err %s aq_err %s\n",

				 i40e_stat_str(&pf->hw, err),

				 "update VSI ctxt for PE failed, err %d aq_err %s\n",

				 err,

				 i40e_aq_str(&pf->hw,

					     pf->hw.aq.asq_last_status));

		}

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

+0 −78
Original line number Diff line number Diff line
@@ -124,84 +124,6 @@ const char *i40e_aq_str(struct i40e_hw *hw, enum i40e_admin_queue_err aq_err) 
	return hw->err_str;

}



/**

 * i40e_stat_str - convert status err code to a string

 * @hw: pointer to the HW structure

 * @stat_err: the status error code to convert

 **/

const char *i40e_stat_str(struct i40e_hw *hw, i40e_status stat_err)

{

	switch (stat_err) {

	case 0:

		return "OK";

	case I40E_ERR_NVM:

		return "I40E_ERR_NVM";

	case I40E_ERR_NVM_CHECKSUM:

		return "I40E_ERR_NVM_CHECKSUM";

	case I40E_ERR_CONFIG:

		return "I40E_ERR_CONFIG";

	case I40E_ERR_PARAM:

		return "I40E_ERR_PARAM";

	case I40E_ERR_UNKNOWN_PHY:

		return "I40E_ERR_UNKNOWN_PHY";

	case I40E_ERR_INVALID_MAC_ADDR:

		return "I40E_ERR_INVALID_MAC_ADDR";

	case I40E_ERR_DEVICE_NOT_SUPPORTED:

		return "I40E_ERR_DEVICE_NOT_SUPPORTED";

	case I40E_ERR_RESET_FAILED:

		return "I40E_ERR_RESET_FAILED";

	case I40E_ERR_NO_AVAILABLE_VSI:

		return "I40E_ERR_NO_AVAILABLE_VSI";

	case I40E_ERR_NO_MEMORY:

		return "I40E_ERR_NO_MEMORY";

	case I40E_ERR_BAD_PTR:

		return "I40E_ERR_BAD_PTR";

	case I40E_ERR_INVALID_SIZE:

		return "I40E_ERR_INVALID_SIZE";

	case I40E_ERR_QUEUE_EMPTY:

		return "I40E_ERR_QUEUE_EMPTY";

	case I40E_ERR_TIMEOUT:

		return "I40E_ERR_TIMEOUT";

	case I40E_ERR_INVALID_SD_INDEX:

		return "I40E_ERR_INVALID_SD_INDEX";

	case I40E_ERR_INVALID_PAGE_DESC_INDEX:

		return "I40E_ERR_INVALID_PAGE_DESC_INDEX";

	case I40E_ERR_INVALID_SD_TYPE:

		return "I40E_ERR_INVALID_SD_TYPE";

	case I40E_ERR_INVALID_HMC_OBJ_INDEX:

		return "I40E_ERR_INVALID_HMC_OBJ_INDEX";

	case I40E_ERR_INVALID_HMC_OBJ_COUNT:

		return "I40E_ERR_INVALID_HMC_OBJ_COUNT";

	case I40E_ERR_ADMIN_QUEUE_ERROR:

		return "I40E_ERR_ADMIN_QUEUE_ERROR";

	case I40E_ERR_ADMIN_QUEUE_TIMEOUT:

		return "I40E_ERR_ADMIN_QUEUE_TIMEOUT";

	case I40E_ERR_BUF_TOO_SHORT:

		return "I40E_ERR_BUF_TOO_SHORT";

	case I40E_ERR_ADMIN_QUEUE_FULL:

		return "I40E_ERR_ADMIN_QUEUE_FULL";

	case I40E_ERR_ADMIN_QUEUE_NO_WORK:

		return "I40E_ERR_ADMIN_QUEUE_NO_WORK";

	case I40E_ERR_NVM_BLANK_MODE:

		return "I40E_ERR_NVM_BLANK_MODE";

	case I40E_ERR_NOT_IMPLEMENTED:

		return "I40E_ERR_NOT_IMPLEMENTED";

	case I40E_ERR_DIAG_TEST_FAILED:

		return "I40E_ERR_DIAG_TEST_FAILED";

	case I40E_ERR_NOT_READY:

		return "I40E_ERR_NOT_READY";

	case I40E_NOT_SUPPORTED:

		return "I40E_NOT_SUPPORTED";

	case I40E_ERR_FIRMWARE_API_VERSION:

		return "I40E_ERR_FIRMWARE_API_VERSION";

	case I40E_ERR_ADMIN_QUEUE_CRITICAL_ERROR:

		return "I40E_ERR_ADMIN_QUEUE_CRITICAL_ERROR";

	}



	snprintf(hw->err_str, sizeof(hw->err_str), "%d", stat_err);

	return hw->err_str;

}



/**

 * i40e_debug_aq

 * @hw: debug mask related to admin queue

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

+8 −8
Original line number Diff line number Diff line
@@ -135,8 +135,8 @@ static int i40e_dcbnl_ieee_setets(struct net_device *netdev, 
	ret = i40e_hw_dcb_config(pf, &pf->tmp_cfg);

	if (ret) {

		dev_info(&pf->pdev->dev,

			 "Failed setting DCB ETS configuration err %s aq_err %s\n",

			 i40e_stat_str(&pf->hw, ret),

			 "Failed setting DCB ETS configuration err %d aq_err %s\n",

			 ret,

			 i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status));

		return -EINVAL;

	}
@@ -174,8 +174,8 @@ static int i40e_dcbnl_ieee_setpfc(struct net_device *netdev, 
	ret = i40e_hw_dcb_config(pf, &pf->tmp_cfg);

	if (ret) {

		dev_info(&pf->pdev->dev,

			 "Failed setting DCB PFC configuration err %s aq_err %s\n",

			 i40e_stat_str(&pf->hw, ret),

			 "Failed setting DCB PFC configuration err %d aq_err %s\n",

			 ret,

			 i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status));

		return -EINVAL;

	}
@@ -225,8 +225,8 @@ static int i40e_dcbnl_ieee_setapp(struct net_device *netdev, 
	ret = i40e_hw_dcb_config(pf, &pf->tmp_cfg);

	if (ret) {

		dev_info(&pf->pdev->dev,

			 "Failed setting DCB configuration err %s aq_err %s\n",

			 i40e_stat_str(&pf->hw, ret),

			 "Failed setting DCB configuration err %d aq_err %s\n",

			 ret,

			 i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status));

		return -EINVAL;

	}
@@ -290,8 +290,8 @@ static int i40e_dcbnl_ieee_delapp(struct net_device *netdev, 
	ret = i40e_hw_dcb_config(pf, &pf->tmp_cfg);

	if (ret) {

		dev_info(&pf->pdev->dev,

			 "Failed setting DCB configuration err %s aq_err %s\n",

			 i40e_stat_str(&pf->hw, ret),

			 "Failed setting DCB configuration err %d aq_err %s\n",

			 ret,

			 i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status));

		return -EINVAL;

	}

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

+20 −21
Original line number Diff line number Diff line
@@ -1455,8 +1455,8 @@ static int i40e_set_link_ksettings(struct net_device *netdev, 
		status = i40e_aq_set_phy_config(hw, &config, NULL);

		if (status) {

			netdev_info(netdev,

				    "Set phy config failed, err %s aq_err %s\n",

				    i40e_stat_str(hw, status),

				    "Set phy config failed, err %d aq_err %s\n",

				    status,

				    i40e_aq_str(hw, hw->aq.asq_last_status));

			err = -EAGAIN;

			goto done;
@@ -1465,8 +1465,8 @@ static int i40e_set_link_ksettings(struct net_device *netdev, 
		status = i40e_update_link_info(hw);

		if (status)

			netdev_dbg(netdev,

				   "Updating link info failed with err %s aq_err %s\n",

				   i40e_stat_str(hw, status),

				   "Updating link info failed with err %d aq_err %s\n",

				   status,

				   i40e_aq_str(hw, hw->aq.asq_last_status));



	} else {
@@ -1517,8 +1517,8 @@ static int i40e_set_fec_cfg(struct net_device *netdev, u8 fec_cfg) 
		status = i40e_aq_set_phy_config(hw, &config, NULL);

		if (status) {

			netdev_info(netdev,

				    "Set phy config failed, err %s aq_err %s\n",

				    i40e_stat_str(hw, status),

				    "Set phy config failed, err %d aq_err %s\n",

				    status,

				    i40e_aq_str(hw, hw->aq.asq_last_status));

			err = -EAGAIN;

			goto done;
@@ -1531,8 +1531,8 @@ static int i40e_set_fec_cfg(struct net_device *netdev, u8 fec_cfg) 
			 * (e.g. no physical connection etc.)

			 */

			netdev_dbg(netdev,

				   "Updating link info failed with err %s aq_err %s\n",

				   i40e_stat_str(hw, status),

				   "Updating link info failed with err %d aq_err %s\n",

				   status,

				   i40e_aq_str(hw, hw->aq.asq_last_status));

	}
@@ -1638,8 +1638,8 @@ static int i40e_nway_reset(struct net_device *netdev) 


	ret = i40e_aq_set_link_restart_an(hw, link_up, NULL);

	if (ret) {

		netdev_info(netdev, "link restart failed, err %s aq_err %s\n",

			    i40e_stat_str(hw, ret),

		netdev_info(netdev, "link restart failed, err %d aq_err %s\n",

			    ret,

			    i40e_aq_str(hw, hw->aq.asq_last_status));

		return -EIO;

	}
@@ -1755,20 +1755,20 @@ static int i40e_set_pauseparam(struct net_device *netdev, 
	status = i40e_set_fc(hw, &aq_failures, link_up);



	if (aq_failures & I40E_SET_FC_AQ_FAIL_GET) {

		netdev_info(netdev, "Set fc failed on the get_phy_capabilities call with err %s aq_err %s\n",

			    i40e_stat_str(hw, status),

		netdev_info(netdev, "Set fc failed on the get_phy_capabilities call with err %d aq_err %s\n",

			    status,

			    i40e_aq_str(hw, hw->aq.asq_last_status));

		err = -EAGAIN;

	}

	if (aq_failures & I40E_SET_FC_AQ_FAIL_SET) {

		netdev_info(netdev, "Set fc failed on the set_phy_config call with err %s aq_err %s\n",

			    i40e_stat_str(hw, status),

		netdev_info(netdev, "Set fc failed on the set_phy_config call with err %d aq_err %s\n",

			    status,

			    i40e_aq_str(hw, hw->aq.asq_last_status));

		err = -EAGAIN;

	}

	if (aq_failures & I40E_SET_FC_AQ_FAIL_UPDATE) {

		netdev_info(netdev, "Set fc failed on the get_link_info call with err %s aq_err %s\n",

			    i40e_stat_str(hw, status),

		netdev_info(netdev, "Set fc failed on the get_link_info call with err %d aq_err %s\n",

			    status,

			    i40e_aq_str(hw, hw->aq.asq_last_status));

		err = -EAGAIN;

	}
@@ -5362,8 +5362,8 @@ static int i40e_set_priv_flags(struct net_device *dev, u32 flags) 
						0, NULL);

		if (ret && pf->hw.aq.asq_last_status != I40E_AQ_RC_ESRCH) {

			dev_info(&pf->pdev->dev,

				 "couldn't set switch config bits, err %s aq_err %s\n",

				 i40e_stat_str(&pf->hw, ret),

				 "couldn't set switch config bits, err %d aq_err %s\n",

				 ret,

				 i40e_aq_str(&pf->hw,

					     pf->hw.aq.asq_last_status));

			/* not a fatal problem, just keep going */
@@ -5435,9 +5435,8 @@ static int i40e_set_priv_flags(struct net_device *dev, u32 flags) 
					return -EBUSY;

				default:

					dev_warn(&pf->pdev->dev,

						 "Starting FW LLDP agent failed: error: %s, %s\n",

						 i40e_stat_str(&pf->hw,

							       status),

						 "Starting FW LLDP agent failed: error: %d, %s\n",

						 status,

						 i40e_aq_str(&pf->hw,

							     adq_err));

					return -EINVAL;

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

+153 −154

File changed.

Preview size limit exceeded, changes collapsed.