i40e: Remove string printing for i40e_status

commit 5d968af27a166e055bdd5f832f095d809eadb992 upstream.

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: Jan Sokolowski <jan.sokolowski@intel.com>
Tested-by: Gurucharan G <gurucharanx.g@intel.com> (A Contingent worker at Intel)
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/net/ethernet/intel/i40e/i40e_client.c b/drivers/net/ethernet/intel/i40e/i40e_client.c
index 10d7a982a5b9b7806a3cd2425ed51726314132f0..d247bed9af59fc249e0e4aa6e369ce63a50285f1 100644 (file)
--- a/drivers/net/ethernet/intel/i40e/i40e_client.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_client.c
@@ -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));
                }

diff --git a/drivers/net/ethernet/intel/i40e/i40e_common.c b/drivers/net/ethernet/intel/i40e/i40e_common.c
index 0b77307841b054fcf214b551012f5d0fd24a44b7..5210e1e2fd44950112847ceadc4a48737e42ef6d 100644 (file)
--- a/drivers/net/ethernet/intel/i40e/i40e_common.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_common.c
@@ -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

diff --git a/drivers/net/ethernet/intel/i40e/i40e_dcb_nl.c b/drivers/net/ethernet/intel/i40e/i40e_dcb_nl.c
index e32c61909b3104fb218636d27c38bec1cf6ba32e..bba70bd5703bfa9168066cc4b29de2a7b03aee5e 100644 (file)
--- a/drivers/net/ethernet/intel/i40e/i40e_dcb_nl.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_dcb_nl.c
@@ -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;
        }

diff --git a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
index 887a735fe2a7b557ced63e14484cce8a6673f091..7ea9d5a35b5545d0d24b91c3deea3fb73ec94997 100644 (file)
--- a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
@@ -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 @@ flags_complete:
                                                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 @@ flags_complete:
                                        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;

diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index 3ac7234a85bbb15790a84903d3a95ee4ab085eca..7552e0b56489394593b5cd054ba76360662a6e65 100644 (file)
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -1822,8 +1822,8 @@ static int i40e_set_mac(struct net_device *netdev, void *p)
                ret = i40e_aq_mac_address_write(hw, I40E_AQC_WRITE_TYPE_LAA_WOL,
                                                addr->sa_data, NULL);
                if (ret)
-                       netdev_info(netdev, "Ignoring error from firmware on LAA update, status %s, AQ ret %s\n",
-                                   i40e_stat_str(hw, ret),
+                       netdev_info(netdev, "Ignoring error from firmware on LAA update, status %d, AQ ret %s\n",
+                                   ret,
                                    i40e_aq_str(hw, hw->aq.asq_last_status));
        }
 
@@ -1854,8 +1854,8 @@ static int i40e_config_rss_aq(struct i40e_vsi *vsi, const u8 *seed,
                ret = i40e_aq_set_rss_key(hw, vsi->id, seed_dw);
                if (ret) {
                        dev_info(&pf->pdev->dev,
-                                "Cannot set RSS key, err %s aq_err %s\n",
-                                i40e_stat_str(hw, ret),
+                                "Cannot set RSS key, err %d aq_err %s\n",
+                                ret,
                                 i40e_aq_str(hw, hw->aq.asq_last_status));
                        return ret;
                }
@@ -1866,8 +1866,8 @@ static int i40e_config_rss_aq(struct i40e_vsi *vsi, const u8 *seed,
                ret = i40e_aq_set_rss_lut(hw, vsi->id, pf_lut, lut, lut_size);
                if (ret) {
                        dev_info(&pf->pdev->dev,
-                                "Cannot set RSS lut, err %s aq_err %s\n",
-                                i40e_stat_str(hw, ret),
+                                "Cannot set RSS lut, err %d aq_err %s\n",
+                                ret,
                                 i40e_aq_str(hw, hw->aq.asq_last_status));
                        return ret;
                }
@@ -2358,8 +2358,8 @@ void i40e_aqc_del_filters(struct i40e_vsi *vsi, const char *vsi_name,
        if (aq_ret && !(aq_status == I40E_AQ_RC_ENOENT)) {
                *retval = -EIO;
                dev_info(&vsi->back->pdev->dev,
-                        "ignoring delete macvlan error on %s, err %s, aq_err %s\n",
-                        vsi_name, i40e_stat_str(hw, aq_ret),
+                        "ignoring delete macvlan error on %s, err %d, aq_err %s\n",
+                        vsi_name, aq_ret,
                         i40e_aq_str(hw, aq_status));
        }
 }
@@ -2488,8 +2488,8 @@ static int i40e_set_promiscuous(struct i40e_pf *pf, bool promisc)
                                                           NULL);
                if (aq_ret) {
                        dev_info(&pf->pdev->dev,
-                                "Set default VSI failed, err %s, aq_err %s\n",
-                                i40e_stat_str(hw, aq_ret),
+                                "Set default VSI failed, err %d, aq_err %s\n",
+                                aq_ret,
                                 i40e_aq_str(hw, hw->aq.asq_last_status));
                }
        } else {
@@ -2500,8 +2500,8 @@ static int i40e_set_promiscuous(struct i40e_pf *pf, bool promisc)
                                                  true);
                if (aq_ret) {
                        dev_info(&pf->pdev->dev,
-                                "set unicast promisc failed, err %s, aq_err %s\n",
-                                i40e_stat_str(hw, aq_ret),
+                                "set unicast promisc failed, err %d, aq_err %s\n",
+                                aq_ret,
                                 i40e_aq_str(hw, hw->aq.asq_last_status));
                }
                aq_ret = i40e_aq_set_vsi_multicast_promiscuous(
@@ -2510,8 +2510,8 @@ static int i40e_set_promiscuous(struct i40e_pf *pf, bool promisc)
                                                  promisc, NULL);
                if (aq_ret) {
                        dev_info(&pf->pdev->dev,
-                                "set multicast promisc failed, err %s, aq_err %s\n",
-                                i40e_stat_str(hw, aq_ret),
+                                "set multicast promisc failed, err %d, aq_err %s\n",
+                                aq_ret,
                                 i40e_aq_str(hw, hw->aq.asq_last_status));
                }
        }
@@ -2814,9 +2814,9 @@ int i40e_sync_vsi_filters(struct i40e_vsi *vsi)
                        retval = i40e_aq_rc_to_posix(aq_ret,
                                                     hw->aq.asq_last_status);
                        dev_info(&pf->pdev->dev,
-                                "set multi promisc failed on %s, err %s aq_err %s\n",
+                                "set multi promisc failed on %s, err %d aq_err %s\n",
                                 vsi_name,
-                                i40e_stat_str(hw, aq_ret),
+                                aq_ret,
                                 i40e_aq_str(hw, hw->aq.asq_last_status));
                } else {
                        dev_info(&pf->pdev->dev, "%s allmulti mode.\n",
@@ -2834,10 +2834,10 @@ int i40e_sync_vsi_filters(struct i40e_vsi *vsi)
                        retval = i40e_aq_rc_to_posix(aq_ret,
                                                     hw->aq.asq_last_status);
                        dev_info(&pf->pdev->dev,
-                                "Setting promiscuous %s failed on %s, err %s aq_err %s\n",
+                                "Setting promiscuous %s failed on %s, err %d aq_err %s\n",
                                 cur_promisc ? "on" : "off",
                                 vsi_name,
-                                i40e_stat_str(hw, aq_ret),
+                                aq_ret,
                                 i40e_aq_str(hw, hw->aq.asq_last_status));
                }
        }
@@ -2985,8 +2985,8 @@ void i40e_vlan_stripping_enable(struct i40e_vsi *vsi)
        ret = i40e_aq_update_vsi_params(&vsi->back->hw, &ctxt, NULL);
        if (ret) {
                dev_info(&vsi->back->pdev->dev,
-                        "update vlan stripping failed, err %s aq_err %s\n",
-                        i40e_stat_str(&vsi->back->hw, ret),
+                        "update vlan stripping failed, err %d aq_err %s\n",
+                        ret,
                         i40e_aq_str(&vsi->back->hw,
                                     vsi->back->hw.aq.asq_last_status));
        }
@@ -3020,8 +3020,8 @@ void i40e_vlan_stripping_disable(struct i40e_vsi *vsi)
        ret = i40e_aq_update_vsi_params(&vsi->back->hw, &ctxt, NULL);
        if (ret) {
                dev_info(&vsi->back->pdev->dev,
-                        "update vlan stripping failed, err %s aq_err %s\n",
-                        i40e_stat_str(&vsi->back->hw, ret),
+                        "update vlan stripping failed, err %d aq_err %s\n",
+                        ret,
                         i40e_aq_str(&vsi->back->hw,
                                     vsi->back->hw.aq.asq_last_status));
        }
@@ -3265,8 +3265,8 @@ int i40e_vsi_add_pvid(struct i40e_vsi *vsi, u16 vid)
        ret = i40e_aq_update_vsi_params(&vsi->back->hw, &ctxt, NULL);
        if (ret) {
                dev_info(&vsi->back->pdev->dev,
-                        "add pvid failed, err %s aq_err %s\n",
-                        i40e_stat_str(&vsi->back->hw, ret),
+                        "add pvid failed, err %d aq_err %s\n",
+                        ret,
                         i40e_aq_str(&vsi->back->hw,
                                     vsi->back->hw.aq.asq_last_status));
                return -ENOENT;
@@ -5533,8 +5533,8 @@ static int i40e_vsi_get_bw_info(struct i40e_vsi *vsi)
        ret = i40e_aq_query_vsi_bw_config(hw, vsi->seid, &bw_config, NULL);
        if (ret) {
                dev_info(&pf->pdev->dev,
-                        "couldn't get PF vsi bw config, err %s aq_err %s\n",
-                        i40e_stat_str(&pf->hw, ret),
+                        "couldn't get PF vsi bw config, err %d aq_err %s\n",
+                        ret,
                         i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status));
                return -EINVAL;
        }
@@ -5544,8 +5544,8 @@ static int i40e_vsi_get_bw_info(struct i40e_vsi *vsi)
                                               NULL);
        if (ret) {
                dev_info(&pf->pdev->dev,
-                        "couldn't get PF vsi ets bw config, err %s aq_err %s\n",
-                        i40e_stat_str(&pf->hw, ret),
+                        "couldn't get PF vsi ets bw config, err %d aq_err %s\n",
+                        ret,
                         i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status));
                return -EINVAL;
        }
@@ -5734,8 +5734,8 @@ int i40e_update_adq_vsi_queues(struct i40e_vsi *vsi, int vsi_offset)
 
        ret = i40e_aq_update_vsi_params(hw, &ctxt, NULL);
        if (ret) {
-               dev_info(&pf->pdev->dev, "Update vsi config failed, err %s aq_err %s\n",
-                        i40e_stat_str(hw, ret),
+               dev_info(&pf->pdev->dev, "Update vsi config failed, err %d aq_err %s\n",
+                        ret,
                         i40e_aq_str(hw, hw->aq.asq_last_status));
                return ret;
        }
@@ -5790,8 +5790,8 @@ static int i40e_vsi_config_tc(struct i40e_vsi *vsi, u8 enabled_tc)
                                                  &bw_config, NULL);
                if (ret) {
                        dev_info(&pf->pdev->dev,
-                                "Failed querying vsi bw info, err %s aq_err %s\n",
-                                i40e_stat_str(hw, ret),
+                                "Failed querying vsi bw info, err %d aq_err %s\n",
+                                ret,
                                 i40e_aq_str(hw, hw->aq.asq_last_status));
                        goto out;
                }
@@ -5857,8 +5857,8 @@ static int i40e_vsi_config_tc(struct i40e_vsi *vsi, u8 enabled_tc)
        ret = i40e_aq_update_vsi_params(hw, &ctxt, NULL);
        if (ret) {
                dev_info(&pf->pdev->dev,
-                        "Update vsi tc config failed, err %s aq_err %s\n",
-                        i40e_stat_str(hw, ret),
+                        "Update vsi tc config failed, err %d aq_err %s\n",
+                        ret,
                         i40e_aq_str(hw, hw->aq.asq_last_status));
                goto out;
        }
@@ -5870,8 +5870,8 @@ static int i40e_vsi_config_tc(struct i40e_vsi *vsi, u8 enabled_tc)
        ret = i40e_vsi_get_bw_info(vsi);
        if (ret) {
                dev_info(&pf->pdev->dev,
-                        "Failed updating vsi bw info, err %s aq_err %s\n",
-                        i40e_stat_str(hw, ret),
+                        "Failed updating vsi bw info, err %d aq_err %s\n",
+                        ret,
                         i40e_aq_str(hw, hw->aq.asq_last_status));
                goto out;
        }
@@ -5962,8 +5962,8 @@ int i40e_set_bw_limit(struct i40e_vsi *vsi, u16 seid, u64 max_tx_rate)
                                          I40E_MAX_BW_INACTIVE_ACCUM, NULL);
        if (ret)
                dev_err(&pf->pdev->dev,
-                       "Failed set tx rate (%llu Mbps) for vsi->seid %u, err %s aq_err %s\n",
-                       max_tx_rate, seid, i40e_stat_str(&pf->hw, ret),
+                       "Failed set tx rate (%llu Mbps) for vsi->seid %u, err %d aq_err %s\n",
+                       max_tx_rate, seid, ret,
                        i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status));
        return ret;
 }
@@ -6038,8 +6038,8 @@ static void i40e_remove_queue_channels(struct i40e_vsi *vsi)
                        last_aq_status = pf->hw.aq.asq_last_status;
                        if (ret)
                                dev_info(&pf->pdev->dev,
-                                        "Failed to delete cloud filter, err %s aq_err %s\n",
-                                        i40e_stat_str(&pf->hw, ret),
+                                        "Failed to delete cloud filter, err %d aq_err %s\n",
+                                        ret,
                                         i40e_aq_str(&pf->hw, last_aq_status));
                        kfree(cfilter);
                }
@@ -6173,8 +6173,8 @@ static int i40e_vsi_reconfig_rss(struct i40e_vsi *vsi, u16 rss_size)
        ret = i40e_config_rss(vsi, seed, lut, vsi->rss_table_size);
        if (ret) {
                dev_info(&pf->pdev->dev,
-                        "Cannot set RSS lut, err %s aq_err %s\n",
-                        i40e_stat_str(hw, ret),
+                        "Cannot set RSS lut, err %d aq_err %s\n",
+                        ret,
                         i40e_aq_str(hw, hw->aq.asq_last_status));
                kfree(lut);
                return ret;
@@ -6272,8 +6272,8 @@ static int i40e_add_channel(struct i40e_pf *pf, u16 uplink_seid,
        ret = i40e_aq_add_vsi(hw, &ctxt, NULL);
        if (ret) {
                dev_info(&pf->pdev->dev,
-                        "add new vsi failed, err %s aq_err %s\n",
-                        i40e_stat_str(&pf->hw, ret),
+                        "add new vsi failed, err %d aq_err %s\n",
+                        ret,
                         i40e_aq_str(&pf->hw,
                                     pf->hw.aq.asq_last_status));
                return -ENOENT;
@@ -6518,8 +6518,8 @@ static int i40e_validate_and_set_switch_mode(struct i40e_vsi *vsi)
                                        mode, NULL);
        if (ret && hw->aq.asq_last_status != I40E_AQ_RC_ESRCH)
                dev_err(&pf->pdev->dev,
-                       "couldn't set switch config bits, err %s aq_err %s\n",
-                       i40e_stat_str(hw, ret),
+                       "couldn't set switch config bits, err %d aq_err %s\n",
+                       ret,
                        i40e_aq_str(hw,
                                    hw->aq.asq_last_status));
 
@@ -6719,8 +6719,8 @@ int i40e_veb_config_tc(struct i40e_veb *veb, u8 enabled_tc)
                                                   &bw_data, NULL);
        if (ret) {
                dev_info(&pf->pdev->dev,
-                        "VEB bw config failed, err %s aq_err %s\n",
-                        i40e_stat_str(&pf->hw, ret),
+                        "VEB bw config failed, err %d aq_err %s\n",
+                        ret,
                         i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status));
                goto out;
        }
@@ -6729,8 +6729,8 @@ int i40e_veb_config_tc(struct i40e_veb *veb, u8 enabled_tc)
        ret = i40e_veb_get_bw_info(veb);
        if (ret) {
                dev_info(&pf->pdev->dev,
-                        "Failed getting veb bw config, err %s aq_err %s\n",
-                        i40e_stat_str(&pf->hw, ret),
+                        "Failed getting veb bw config, err %d aq_err %s\n",
+                        ret,
                         i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status));
        }
 
@@ -6813,8 +6813,8 @@ static int i40e_resume_port_tx(struct i40e_pf *pf)
        ret = i40e_aq_resume_port_tx(hw, NULL);
        if (ret) {
                dev_info(&pf->pdev->dev,
-                        "Resume Port Tx failed, err %s aq_err %s\n",
-                         i40e_stat_str(&pf->hw, ret),
+                        "Resume Port Tx failed, err %d aq_err %s\n",
+                         ret,
                          i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status));
                /* Schedule PF reset to recover */
                set_bit(__I40E_PF_RESET_REQUESTED, pf->state);
@@ -6838,8 +6838,8 @@ static int i40e_suspend_port_tx(struct i40e_pf *pf)
        ret = i40e_aq_suspend_port_tx(hw, pf->mac_seid, NULL);
        if (ret) {
                dev_info(&pf->pdev->dev,
-                        "Suspend Port Tx failed, err %s aq_err %s\n",
-                        i40e_stat_str(&pf->hw, ret),
+                        "Suspend Port Tx failed, err %d aq_err %s\n",
+                        ret,
                         i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status));
                /* Schedule PF reset to recover */
                set_bit(__I40E_PF_RESET_REQUESTED, pf->state);
@@ -6878,8 +6878,8 @@ static int i40e_hw_set_dcb_config(struct i40e_pf *pf,
        ret = i40e_set_dcb_config(&pf->hw);
        if (ret) {
                dev_info(&pf->pdev->dev,
-                        "Set DCB Config failed, err %s aq_err %s\n",
-                        i40e_stat_str(&pf->hw, ret),
+                        "Set DCB Config failed, err %d aq_err %s\n",
+                        ret,
                         i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status));
                goto out;
        }
@@ -6995,8 +6995,8 @@ int i40e_hw_dcb_config(struct i40e_pf *pf, struct i40e_dcbx_config *new_cfg)
                 i40e_aqc_opc_modify_switching_comp_ets, NULL);
        if (ret) {
                dev_info(&pf->pdev->dev,
-                        "Modify Port ETS failed, err %s aq_err %s\n",
-                        i40e_stat_str(&pf->hw, ret),
+                        "Modify Port ETS failed, err %d aq_err %s\n",
+                        ret,
                         i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status));
                goto out;
        }
@@ -7033,8 +7033,8 @@ int i40e_hw_dcb_config(struct i40e_pf *pf, struct i40e_dcbx_config *new_cfg)
        ret = i40e_aq_dcb_updated(&pf->hw, NULL);
        if (ret) {
                dev_info(&pf->pdev->dev,
-                        "DCB Updated failed, err %s aq_err %s\n",
-                        i40e_stat_str(&pf->hw, ret),
+                        "DCB Updated failed, err %d aq_err %s\n",
+                        ret,
                         i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status));
                goto out;
        }
@@ -7117,8 +7117,8 @@ int i40e_dcb_sw_default_config(struct i40e_pf *pf)
                 i40e_aqc_opc_enable_switching_comp_ets, NULL);
        if (err) {
                dev_info(&pf->pdev->dev,
-                        "Enable Port ETS failed, err %s aq_err %s\n",
-                        i40e_stat_str(&pf->hw, err),
+                        "Enable Port ETS failed, err %d aq_err %s\n",
+                        err,
                         i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status));
                err = -ENOENT;
                goto out;
@@ -7197,8 +7197,8 @@ static int i40e_init_pf_dcb(struct i40e_pf *pf)
                pf->flags |= I40E_FLAG_DISABLE_FW_LLDP;
        } else {
                dev_info(&pf->pdev->dev,
-                        "Query for DCB configuration failed, err %s aq_err %s\n",
-                        i40e_stat_str(&pf->hw, err),
+                        "Query for DCB configuration failed, err %d aq_err %s\n",
+                        err,
                         i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status));
        }
 
@@ -7436,8 +7436,8 @@ static i40e_status i40e_force_link_state(struct i40e_pf *pf, bool is_up)
                                           NULL);
        if (err) {
                dev_err(&pf->pdev->dev,
-                       "failed to get phy cap., ret =  %s last_status =  %s\n",
-                       i40e_stat_str(hw, err),
+                       "failed to get phy cap., ret =  %d last_status =  %s\n",
+                       err,
                        i40e_aq_str(hw, hw->aq.asq_last_status));
                return err;
        }
@@ -7448,8 +7448,8 @@ static i40e_status i40e_force_link_state(struct i40e_pf *pf, bool is_up)
                                           NULL);
        if (err) {
                dev_err(&pf->pdev->dev,
-                       "failed to get phy cap., ret =  %s last_status =  %s\n",
-                       i40e_stat_str(hw, err),
+                       "failed to get phy cap., ret =  %d last_status =  %s\n",
+                       err,
                        i40e_aq_str(hw, hw->aq.asq_last_status));
                return err;
        }
@@ -7493,8 +7493,8 @@ static i40e_status i40e_force_link_state(struct i40e_pf *pf, bool is_up)
 
        if (err) {
                dev_err(&pf->pdev->dev,
-                       "set phy config ret =  %s last_status =  %s\n",
-                       i40e_stat_str(&pf->hw, err),
+                       "set phy config ret =  %d last_status =  %s\n",
+                       err,
                        i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status));
                return err;
        }
@@ -7834,8 +7834,8 @@ static int i40e_fwd_ring_up(struct i40e_vsi *vsi, struct net_device *vdev,
                        rx_ring->netdev = NULL;
                }
                dev_info(&pf->pdev->dev,
-                        "Error adding mac filter on macvlan err %s, aq_err %s\n",
-                         i40e_stat_str(hw, ret),
+                        "Error adding mac filter on macvlan err %d, aq_err %s\n",
+                         ret,
                          i40e_aq_str(hw, aq_err));
                netdev_err(vdev, "L2fwd offload disabled to L2 filter error\n");
        }
@@ -7907,8 +7907,8 @@ static int i40e_setup_macvlans(struct i40e_vsi *vsi, u16 macvlan_cnt, u16 qcnt,
        ret = i40e_aq_update_vsi_params(hw, &ctxt, NULL);
        if (ret) {
                dev_info(&pf->pdev->dev,
-                        "Update vsi tc config failed, err %s aq_err %s\n",
-                        i40e_stat_str(hw, ret),
+                        "Update vsi tc config failed, err %d aq_err %s\n",
+                        ret,
                         i40e_aq_str(hw, hw->aq.asq_last_status));
                return ret;
        }
@@ -8123,8 +8123,8 @@ static void i40e_fwd_del(struct net_device *netdev, void *vdev)
                                ch->fwd = NULL;
                        } else {
                                dev_info(&pf->pdev->dev,
-                                        "Error deleting mac filter on macvlan err %s, aq_err %s\n",
-                                         i40e_stat_str(hw, ret),
+                                        "Error deleting mac filter on macvlan err %d, aq_err %s\n",
+                                         ret,
                                          i40e_aq_str(hw, aq_err));
                        }
                        break;
@@ -8875,8 +8875,7 @@ static int i40e_delete_clsflower(struct i40e_vsi *vsi,
        kfree(filter);
        if (err) {
                dev_err(&pf->pdev->dev,
-                       "Failed to delete cloud filter, err %s\n",
-                       i40e_stat_str(&pf->hw, err));
+                       "Failed to delete cloud filter, err %d\n", err);
                return i40e_aq_rc_to_posix(err, pf->hw.aq.asq_last_status);
        }
 
@@ -9438,8 +9437,8 @@ static int i40e_handle_lldp_event(struct i40e_pf *pf,
                        pf->flags &= ~I40E_FLAG_DCB_CAPABLE;
                } else {
                        dev_info(&pf->pdev->dev,
-                                "Failed querying DCB configuration data from firmware, err %s aq_err %s\n",
-                                i40e_stat_str(&pf->hw, ret),
+                                "Failed querying DCB configuration data from firmware, err %d aq_err %s\n",
+                                ret,
                                 i40e_aq_str(&pf->hw,
                                             pf->hw.aq.asq_last_status));
                }
@@ -10265,8 +10264,8 @@ static void i40e_enable_pf_switch_lb(struct i40e_pf *pf)
        ret = i40e_aq_get_vsi_params(&pf->hw, &ctxt, NULL);
        if (ret) {
                dev_info(&pf->pdev->dev,
-                        "couldn't get PF vsi config, err %s aq_err %s\n",
-                        i40e_stat_str(&pf->hw, ret),
+                        "couldn't get PF vsi config, err %d aq_err %s\n",
+                        ret,
                         i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status));
                return;
        }
@@ -10277,8 +10276,8 @@ static void i40e_enable_pf_switch_lb(struct i40e_pf *pf)
        ret = i40e_aq_update_vsi_params(&vsi->back->hw, &ctxt, NULL);
        if (ret) {
                dev_info(&pf->pdev->dev,
-                        "update vsi switch failed, err %s aq_err %s\n",
-                        i40e_stat_str(&pf->hw, ret),
+                        "update vsi switch failed, err %d aq_err %s\n",
+                        ret,
                         i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status));
        }
 }
@@ -10301,8 +10300,8 @@ static void i40e_disable_pf_switch_lb(struct i40e_pf *pf)
        ret = i40e_aq_get_vsi_params(&pf->hw, &ctxt, NULL);
        if (ret) {
                dev_info(&pf->pdev->dev,
-                        "couldn't get PF vsi config, err %s aq_err %s\n",
-                        i40e_stat_str(&pf->hw, ret),
+                        "couldn't get PF vsi config, err %d aq_err %s\n",
+                        ret,
                         i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status));
                return;
        }
@@ -10313,8 +10312,8 @@ static void i40e_disable_pf_switch_lb(struct i40e_pf *pf)
        ret = i40e_aq_update_vsi_params(&vsi->back->hw, &ctxt, NULL);
        if (ret) {
                dev_info(&pf->pdev->dev,
-                        "update vsi switch failed, err %s aq_err %s\n",
-                        i40e_stat_str(&pf->hw, ret),
+                        "update vsi switch failed, err %d aq_err %s\n",
+                        ret,
                         i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status));
        }
 }
@@ -10458,8 +10457,8 @@ static int i40e_get_capabilities(struct i40e_pf *pf,
                        buf_len = data_size;
                } else if (pf->hw.aq.asq_last_status != I40E_AQ_RC_OK || err) {
                        dev_info(&pf->pdev->dev,
-                                "capability discovery failed, err %s aq_err %s\n",
-                                i40e_stat_str(&pf->hw, err),
+                                "capability discovery failed, err %d aq_err %s\n",
+                                err,
                                 i40e_aq_str(&pf->hw,
                                             pf->hw.aq.asq_last_status));
                        return -ENODEV;
@@ -10596,8 +10595,8 @@ static int i40e_rebuild_cloud_filters(struct i40e_vsi *vsi, u16 seid)
 
                if (ret) {
                        dev_dbg(&pf->pdev->dev,
-                               "Failed to rebuild cloud filter, err %s aq_err %s\n",
-                               i40e_stat_str(&pf->hw, ret),
+                               "Failed to rebuild cloud filter, err %d aq_err %s\n",
+                               ret,
                                i40e_aq_str(&pf->hw,
                                            pf->hw.aq.asq_last_status));
                        return ret;
@@ -10837,8 +10836,8 @@ static void i40e_rebuild(struct i40e_pf *pf, bool reinit, bool lock_acquired)
        /* rebuild the basics for the AdminQ, HMC, and initial HW switch */
        ret = i40e_init_adminq(&pf->hw);
        if (ret) {
-               dev_info(&pf->pdev->dev, "Rebuild AdminQ failed, err %s aq_err %s\n",
-                        i40e_stat_str(&pf->hw, ret),
+               dev_info(&pf->pdev->dev, "Rebuild AdminQ failed, err %d aq_err %s\n",
+                        ret,
                         i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status));
                goto clear_recovery;
        }
@@ -10949,8 +10948,8 @@ static void i40e_rebuild(struct i40e_pf *pf, bool reinit, bool lock_acquired)
                                         I40E_AQ_EVENT_MEDIA_NA |
                                         I40E_AQ_EVENT_MODULE_QUAL_FAIL), NULL);
        if (ret)
-               dev_info(&pf->pdev->dev, "set phy mask fail, err %s aq_err %s\n",
-                        i40e_stat_str(&pf->hw, ret),
+               dev_info(&pf->pdev->dev, "set phy mask fail, err %d aq_err %s\n",
+                        ret,
                         i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status));
 
        /* Rebuild the VSIs and VEBs that existed before reset.
@@ -11053,8 +11052,8 @@ static void i40e_rebuild(struct i40e_pf *pf, bool reinit, bool lock_acquired)
                msleep(75);
                ret = i40e_aq_set_link_restart_an(&pf->hw, true, NULL);
                if (ret)
-                       dev_info(&pf->pdev->dev, "link restart failed, err %s aq_err %s\n",
-                                i40e_stat_str(&pf->hw, ret),
+                       dev_info(&pf->pdev->dev, "link restart failed, err %d aq_err %s\n",
+                                ret,
                                 i40e_aq_str(&pf->hw,
                                             pf->hw.aq.asq_last_status));
        }
@@ -11085,9 +11084,9 @@ static void i40e_rebuild(struct i40e_pf *pf, bool reinit, bool lock_acquired)
        ret = i40e_set_promiscuous(pf, pf->cur_promisc);
        if (ret)
                dev_warn(&pf->pdev->dev,
-                        "Failed to restore promiscuous setting: %s, err %s aq_err %s\n",
+                        "Failed to restore promiscuous setting: %s, err %d aq_err %s\n",
                         pf->cur_promisc ? "on" : "off",
-                        i40e_stat_str(&pf->hw, ret),
+                        ret,
                         i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status));
 
        i40e_reset_all_vfs(pf, true);
@@ -12221,8 +12220,8 @@ static int i40e_get_rss_aq(struct i40e_vsi *vsi, const u8 *seed,
                        (struct i40e_aqc_get_set_rss_key_data *)seed);
                if (ret) {
                        dev_info(&pf->pdev->dev,
-                                "Cannot get RSS key, err %s aq_err %s\n",
-                                i40e_stat_str(&pf->hw, ret),
+                                "Cannot get RSS key, err %d aq_err %s\n",
+                                ret,
                                 i40e_aq_str(&pf->hw,
                                             pf->hw.aq.asq_last_status));
                        return ret;
@@ -12235,8 +12234,8 @@ static int i40e_get_rss_aq(struct i40e_vsi *vsi, const u8 *seed,
                ret = i40e_aq_get_rss_lut(hw, vsi->id, pf_lut, lut, lut_size);
                if (ret) {
                        dev_info(&pf->pdev->dev,
-                                "Cannot get RSS lut, err %s aq_err %s\n",
-                                i40e_stat_str(&pf->hw, ret),
+                                "Cannot get RSS lut, err %d aq_err %s\n",
+                                ret,
                                 i40e_aq_str(&pf->hw,
                                             pf->hw.aq.asq_last_status));
                        return ret;
@@ -12576,8 +12575,8 @@ i40e_status i40e_commit_partition_bw_setting(struct i40e_pf *pf)
        last_aq_status = pf->hw.aq.asq_last_status;
        if (ret) {
                dev_info(&pf->pdev->dev,
-                        "Cannot acquire NVM for read access, err %s aq_err %s\n",
-                        i40e_stat_str(&pf->hw, ret),
+                        "Cannot acquire NVM for read access, err %d aq_err %s\n",
+                        ret,
                         i40e_aq_str(&pf->hw, last_aq_status));
                goto bw_commit_out;
        }
@@ -12593,8 +12592,8 @@ i40e_status i40e_commit_partition_bw_setting(struct i40e_pf *pf)
        last_aq_status = pf->hw.aq.asq_last_status;
        i40e_release_nvm(&pf->hw);
        if (ret) {
-               dev_info(&pf->pdev->dev, "NVM read error, err %s aq_err %s\n",
-                        i40e_stat_str(&pf->hw, ret),
+               dev_info(&pf->pdev->dev, "NVM read error, err %d aq_err %s\n",
+                        ret,
                         i40e_aq_str(&pf->hw, last_aq_status));
                goto bw_commit_out;
        }
@@ -12607,8 +12606,8 @@ i40e_status i40e_commit_partition_bw_setting(struct i40e_pf *pf)
        last_aq_status = pf->hw.aq.asq_last_status;
        if (ret) {
                dev_info(&pf->pdev->dev,
-                        "Cannot acquire NVM for write access, err %s aq_err %s\n",
-                        i40e_stat_str(&pf->hw, ret),
+                        "Cannot acquire NVM for write access, err %d aq_err %s\n",
+                        ret,
                         i40e_aq_str(&pf->hw, last_aq_status));
                goto bw_commit_out;
        }
@@ -12627,8 +12626,8 @@ i40e_status i40e_commit_partition_bw_setting(struct i40e_pf *pf)
        i40e_release_nvm(&pf->hw);
        if (ret)
                dev_info(&pf->pdev->dev,
-                        "BW settings NOT SAVED, err %s aq_err %s\n",
-                        i40e_stat_str(&pf->hw, ret),
+                        "BW settings NOT SAVED, err %d aq_err %s\n",
+                        ret,
                         i40e_aq_str(&pf->hw, last_aq_status));
 bw_commit_out:
 
@@ -12682,8 +12681,8 @@ static bool i40e_is_total_port_shutdown_enabled(struct i40e_pf *pf)
 
 err_nvm:
        dev_warn(&pf->pdev->dev,
-                "total-port-shutdown feature is off due to read nvm error: %s\n",
-                i40e_stat_str(&pf->hw, read_status));
+                "total-port-shutdown feature is off due to read nvm error: %d\n",
+                read_status);
        return ret;
 }
 
@@ -13036,8 +13035,8 @@ static int i40e_udp_tunnel_set_port(struct net_device *netdev,
        ret = i40e_aq_add_udp_tunnel(hw, ntohs(ti->port), type, &filter_index,
                                     NULL);
        if (ret) {
-               netdev_info(netdev, "add UDP port failed, err %s aq_err %s\n",
-                           i40e_stat_str(hw, ret),
+               netdev_info(netdev, "add UDP port failed, err %d aq_err %s\n",
+                           ret,
                            i40e_aq_str(hw, hw->aq.asq_last_status));
                return -EIO;
        }
@@ -13056,8 +13055,8 @@ static int i40e_udp_tunnel_unset_port(struct net_device *netdev,
 
        ret = i40e_aq_del_udp_tunnel(hw, ti->hw_priv, NULL);
        if (ret) {
-               netdev_info(netdev, "delete UDP port failed, err %s aq_err %s\n",
-                           i40e_stat_str(hw, ret),
+               netdev_info(netdev, "delete UDP port failed, err %d aq_err %s\n",
+                           ret,
                            i40e_aq_str(hw, hw->aq.asq_last_status));
                return -EIO;
        }
@@ -13946,8 +13945,8 @@ static int i40e_add_vsi(struct i40e_vsi *vsi)
                ctxt.flags = I40E_AQ_VSI_TYPE_PF;
                if (ret) {
                        dev_info(&pf->pdev->dev,
-                                "couldn't get PF vsi config, err %s aq_err %s\n",
-                                i40e_stat_str(&pf->hw, ret),
+                                "couldn't get PF vsi config, err %d aq_err %s\n",
+                                ret,
                                 i40e_aq_str(&pf->hw,
                                             pf->hw.aq.asq_last_status));
                        return -ENOENT;
@@ -13976,8 +13975,8 @@ static int i40e_add_vsi(struct i40e_vsi *vsi)
                        ret = i40e_aq_update_vsi_params(hw, &ctxt, NULL);
                        if (ret) {
                                dev_info(&pf->pdev->dev,
-                                        "update vsi failed, err %s aq_err %s\n",
-                                        i40e_stat_str(&pf->hw, ret),
+                                        "update vsi failed, err %d aq_err %s\n",
+                                        ret,
                                         i40e_aq_str(&pf->hw,
                                                     pf->hw.aq.asq_last_status));
                                ret = -ENOENT;
@@ -13996,8 +13995,8 @@ static int i40e_add_vsi(struct i40e_vsi *vsi)
                        ret = i40e_aq_update_vsi_params(hw, &ctxt, NULL);
                        if (ret) {
                                dev_info(&pf->pdev->dev,
-                                        "update vsi failed, err %s aq_err %s\n",
-                                        i40e_stat_str(&pf->hw, ret),
+                                        "update vsi failed, err %d aq_err %s\n",
+                                        ret,
                                         i40e_aq_str(&pf->hw,
                                                    pf->hw.aq.asq_last_status));
                                ret = -ENOENT;
@@ -14019,9 +14018,9 @@ static int i40e_add_vsi(struct i40e_vsi *vsi)
                                 * message and continue
                                 */
                                dev_info(&pf->pdev->dev,
-                                        "failed to configure TCs for main VSI tc_map 0x%08x, err %s aq_err %s\n",
+                                        "failed to configure TCs for main VSI tc_map 0x%08x, err %d aq_err %s\n",
                                         enabled_tc,
-                                        i40e_stat_str(&pf->hw, ret),
+                                        ret,
                                         i40e_aq_str(&pf->hw,
                                                    pf->hw.aq.asq_last_status));
                        }
@@ -14115,8 +14114,8 @@ static int i40e_add_vsi(struct i40e_vsi *vsi)
                ret = i40e_aq_add_vsi(hw, &ctxt, NULL);
                if (ret) {
                        dev_info(&vsi->back->pdev->dev,
-                                "add vsi failed, err %s aq_err %s\n",
-                                i40e_stat_str(&pf->hw, ret),
+                                "add vsi failed, err %d aq_err %s\n",
+                                ret,
                                 i40e_aq_str(&pf->hw,
                                             pf->hw.aq.asq_last_status));
                        ret = -ENOENT;
@@ -14147,8 +14146,8 @@ static int i40e_add_vsi(struct i40e_vsi *vsi)
        ret = i40e_vsi_get_bw_info(vsi);
        if (ret) {
                dev_info(&pf->pdev->dev,
-                        "couldn't get vsi bw info, err %s aq_err %s\n",
-                        i40e_stat_str(&pf->hw, ret),
+                        "couldn't get vsi bw info, err %d aq_err %s\n",
+                        ret,
                         i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status));
                /* VSI is already added so not tearing that up */
                ret = 0;
@@ -14594,8 +14593,8 @@ static int i40e_veb_get_bw_info(struct i40e_veb *veb)
                                                  &bw_data, NULL);
        if (ret) {
                dev_info(&pf->pdev->dev,
-                        "query veb bw config failed, err %s aq_err %s\n",
-                        i40e_stat_str(&pf->hw, ret),
+                        "query veb bw config failed, err %d aq_err %s\n",
+                        ret,
                         i40e_aq_str(&pf->hw, hw->aq.asq_last_status));
                goto out;
        }
@@ -14604,8 +14603,8 @@ static int i40e_veb_get_bw_info(struct i40e_veb *veb)
                                                   &ets_data, NULL);
        if (ret) {
                dev_info(&pf->pdev->dev,
-                        "query veb bw ets config failed, err %s aq_err %s\n",
-                        i40e_stat_str(&pf->hw, ret),
+                        "query veb bw ets config failed, err %d aq_err %s\n",
+                        ret,
                         i40e_aq_str(&pf->hw, hw->aq.asq_last_status));
                goto out;
        }
@@ -14801,8 +14800,8 @@ static int i40e_add_veb(struct i40e_veb *veb, struct i40e_vsi *vsi)
        /* get a VEB from the hardware */
        if (ret) {
                dev_info(&pf->pdev->dev,
-                        "couldn't add VEB, err %s aq_err %s\n",
-                        i40e_stat_str(&pf->hw, ret),
+                        "couldn't add VEB, err %d aq_err %s\n",
+                        ret,
                         i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status));
                return -EPERM;
        }
@@ -14812,16 +14811,16 @@ static int i40e_add_veb(struct i40e_veb *veb, struct i40e_vsi *vsi)
                                         &veb->stats_idx, NULL, NULL, NULL);
        if (ret) {
                dev_info(&pf->pdev->dev,
-                        "couldn't get VEB statistics idx, err %s aq_err %s\n",
-                        i40e_stat_str(&pf->hw, ret),
+                        "couldn't get VEB statistics idx, err %d aq_err %s\n",
+                        ret,
                         i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status));
                return -EPERM;
        }
        ret = i40e_veb_get_bw_info(veb);
        if (ret) {
                dev_info(&pf->pdev->dev,
-                        "couldn't get VEB bw info, err %s aq_err %s\n",
-                        i40e_stat_str(&pf->hw, ret),
+                        "couldn't get VEB bw info, err %d aq_err %s\n",
+                        ret,
                         i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status));
                i40e_aq_delete_element(&pf->hw, veb->seid, NULL);
                return -ENOENT;
@@ -15031,8 +15030,8 @@ int i40e_fetch_switch_configuration(struct i40e_pf *pf, bool printconfig)
                                                &next_seid, NULL);
                if (ret) {
                        dev_info(&pf->pdev->dev,
-                                "get switch config failed err %s aq_err %s\n",
-                                i40e_stat_str(&pf->hw, ret),
+                                "get switch config failed err %d aq_err %s\n",
+                                ret,
                                 i40e_aq_str(&pf->hw,
                                             pf->hw.aq.asq_last_status));
                        kfree(aq_buf);
@@ -15077,8 +15076,8 @@ static int i40e_setup_pf_switch(struct i40e_pf *pf, bool reinit, bool lock_acqui
        ret = i40e_fetch_switch_configuration(pf, false);
        if (ret) {
                dev_info(&pf->pdev->dev,
-                        "couldn't fetch switch config, err %s aq_err %s\n",
-                        i40e_stat_str(&pf->hw, ret),
+                        "couldn't fetch switch config, err %d aq_err %s\n",
+                        ret,
                         i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status));
                return ret;
        }
@@ -15104,8 +15103,8 @@ static int i40e_setup_pf_switch(struct i40e_pf *pf, bool reinit, bool lock_acqui
                                                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 */
@@ -16010,8 +16009,8 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                                         I40E_AQ_EVENT_MEDIA_NA |
                                         I40E_AQ_EVENT_MODULE_QUAL_FAIL), NULL);
        if (err)
-               dev_info(&pf->pdev->dev, "set phy mask fail, err %s aq_err %s\n",
-                        i40e_stat_str(&pf->hw, err),
+               dev_info(&pf->pdev->dev, "set phy mask fail, err %d aq_err %s\n",
+                        err,
                         i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status));
 
        /* Reconfigure hardware for allowing smaller MSS in the case
@@ -16029,8 +16028,8 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                msleep(75);
                err = i40e_aq_set_link_restart_an(&pf->hw, true, NULL);
                if (err)
-                       dev_info(&pf->pdev->dev, "link restart failed, err %s aq_err %s\n",
-                                i40e_stat_str(&pf->hw, err),
+                       dev_info(&pf->pdev->dev, "link restart failed, err %d aq_err %s\n",
+                                err,
                                 i40e_aq_str(&pf->hw,
                                             pf->hw.aq.asq_last_status));
        }
@@ -16162,8 +16161,8 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        /* get the requested speeds from the fw */
        err = i40e_aq_get_phy_capabilities(hw, false, false, &abilities, NULL);
        if (err)
-               dev_dbg(&pf->pdev->dev, "get requested speeds ret =  %s last_status =  %s\n",
-                       i40e_stat_str(&pf->hw, err),
+               dev_dbg(&pf->pdev->dev, "get requested speeds ret =  %d last_status =  %s\n",
+                       err,
                        i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status));
        pf->hw.phy.link_info.requested_speeds = abilities.link_speed;
 
@@ -16173,8 +16172,8 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        /* get the supported phy types from the fw */
        err = i40e_aq_get_phy_capabilities(hw, false, true, &abilities, NULL);
        if (err)
-               dev_dbg(&pf->pdev->dev, "get supported phy types ret =  %s last_status =  %s\n",
-                       i40e_stat_str(&pf->hw, err),
+               dev_dbg(&pf->pdev->dev, "get supported phy types ret =  %d last_status =  %s\n",
+                       err,
                        i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status));
 
        /* make sure the MFS hasn't been set lower than the default */

diff --git a/drivers/net/ethernet/intel/i40e/i40e_nvm.c b/drivers/net/ethernet/intel/i40e/i40e_nvm.c
index 3a38bf8bcde7ef0da0bc20a759d814f0e5a6b0c8..c24348afc2f51d6d21235953eff99e5e0669c420 100644 (file)
--- a/drivers/net/ethernet/intel/i40e/i40e_nvm.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_nvm.c
@@ -1429,8 +1429,8 @@ static i40e_status i40e_nvmupd_exec_aq(struct i40e_hw *hw,
                                       buff_size, &cmd_details);
        if (status) {
                i40e_debug(hw, I40E_DEBUG_NVM,
-                          "i40e_nvmupd_exec_aq err %s aq_err %s\n",
-                          i40e_stat_str(hw, status),
+                          "%s err %d aq_err %s\n",
+                          __func__, status,
                           i40e_aq_str(hw, hw->aq.asq_last_status));
                *perrno = i40e_aq_rc_to_posix(status, hw->aq.asq_last_status);
                return status;

diff --git a/drivers/net/ethernet/intel/i40e/i40e_prototype.h b/drivers/net/ethernet/intel/i40e/i40e_prototype.h
index 9a71121420c3b63e5fa49eed99e039a79474c7d7..01ab63d28e3f2e4fd5def6cd1dcdd58d79571e86 100644 (file)
--- a/drivers/net/ethernet/intel/i40e/i40e_prototype.h
+++ b/drivers/net/ethernet/intel/i40e/i40e_prototype.h
@@ -55,7 +55,6 @@ void i40e_idle_aq(struct i40e_hw *hw);
 bool i40e_check_asq_alive(struct i40e_hw *hw);
 i40e_status i40e_aq_queue_shutdown(struct i40e_hw *hw, bool unloading);
 const char *i40e_aq_str(struct i40e_hw *hw, enum i40e_admin_queue_err aq_err);
-const char *i40e_stat_str(struct i40e_hw *hw, i40e_status stat_err);
 
 i40e_status i40e_aq_get_rss_lut(struct i40e_hw *hw, u16 seid,
                                bool pf_lut, u8 *lut, u16 lut_size);

diff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
index 635f93d60318634693ad9612fa600873b869afca..3ac901a4539f004fd680b9a774d3f37b79fdbc11 100644 (file)
--- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
@@ -1264,9 +1264,9 @@ i40e_set_vsi_promisc(struct i40e_vf *vf, u16 seid, bool multi_enable,
                        int aq_err = pf->hw.aq.asq_last_status;
 
                        dev_err(&pf->pdev->dev,
-                               "VF %d failed to set multicast promiscuous mode err %s aq_err %s\n",
+                               "VF %d failed to set multicast promiscuous mode err %d aq_err %s\n",
                                vf->vf_id,
-                               i40e_stat_str(&pf->hw, aq_ret),
+                               aq_ret,
                                i40e_aq_str(&pf->hw, aq_err));
 
                        return aq_ret;
@@ -1280,9 +1280,9 @@ i40e_set_vsi_promisc(struct i40e_vf *vf, u16 seid, bool multi_enable,
                        int aq_err = pf->hw.aq.asq_last_status;
 
                        dev_err(&pf->pdev->dev,
-                               "VF %d failed to set unicast promiscuous mode err %s aq_err %s\n",
+                               "VF %d failed to set unicast promiscuous mode err %d aq_err %s\n",
                                vf->vf_id,
-                               i40e_stat_str(&pf->hw, aq_ret),
+                               aq_ret,
                                i40e_aq_str(&pf->hw, aq_err));
                }
 
@@ -1297,9 +1297,9 @@ i40e_set_vsi_promisc(struct i40e_vf *vf, u16 seid, bool multi_enable,
                        int aq_err = pf->hw.aq.asq_last_status;
 
                        dev_err(&pf->pdev->dev,
-                               "VF %d failed to set multicast promiscuous mode err %s aq_err %s\n",
+                               "VF %d failed to set multicast promiscuous mode err %d aq_err %s\n",
                                vf->vf_id,
-                               i40e_stat_str(&pf->hw, aq_ret),
+                               aq_ret,
                                i40e_aq_str(&pf->hw, aq_err));
 
                        if (!aq_tmp)
@@ -1313,9 +1313,9 @@ i40e_set_vsi_promisc(struct i40e_vf *vf, u16 seid, bool multi_enable,
                        int aq_err = pf->hw.aq.asq_last_status;
 
                        dev_err(&pf->pdev->dev,
-                               "VF %d failed to set unicast promiscuous mode err %s aq_err %s\n",
+                               "VF %d failed to set unicast promiscuous mode err %d aq_err %s\n",
                                vf->vf_id,
-                               i40e_stat_str(&pf->hw, aq_ret),
+                               aq_ret,
                                i40e_aq_str(&pf->hw, aq_err));
 
                        if (!aq_tmp)
@@ -3615,8 +3615,8 @@ static void i40e_del_all_cloud_filters(struct i40e_vf *vf)
                        ret = i40e_add_del_cloud_filter(vsi, cfilter, false);
                if (ret)
                        dev_err(&pf->pdev->dev,
-                               "VF %d: Failed to delete cloud filter, err %s aq_err %s\n",
-                               vf->vf_id, i40e_stat_str(&pf->hw, ret),
+                               "VF %d: Failed to delete cloud filter, err %d aq_err %s\n",
+                               vf->vf_id, ret,
                                i40e_aq_str(&pf->hw,
                                            pf->hw.aq.asq_last_status));
 
@@ -3718,8 +3718,8 @@ static int i40e_vc_del_cloud_filter(struct i40e_vf *vf, u8 *msg)
                ret = i40e_add_del_cloud_filter(vsi, &cfilter, false);
        if (ret) {
                dev_err(&pf->pdev->dev,
-                       "VF %d: Failed to delete cloud filter, err %s aq_err %s\n",
-                       vf->vf_id, i40e_stat_str(&pf->hw, ret),
+                       "VF %d: Failed to delete cloud filter, err %d aq_err %s\n",
+                       vf->vf_id, ret,
                        i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status));
                goto err;
        }
@@ -3852,8 +3852,8 @@ static int i40e_vc_add_cloud_filter(struct i40e_vf *vf, u8 *msg)
                ret = i40e_add_del_cloud_filter(vsi, cfilter, true);
        if (ret) {
                dev_err(&pf->pdev->dev,
-                       "VF %d: Failed to add cloud filter, err %s aq_err %s\n",
-                       vf->vf_id, i40e_stat_str(&pf->hw, ret),
+                       "VF %d: Failed to add cloud filter, err %d aq_err %s\n",
+                       vf->vf_id, ret,
                        i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status));
                goto err_free;
        }