i40e: cleanup strings

This patch cleans up the strings that the driver prints during normal
operation and moves many strings into dev_dbg.  It also cleans up
strings printed during reset.

Change-ID: I1835cc4e3c3b22596182b683284e6bb87eac61b2
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Catherine Sullivan <catherine.sullivan@intel.com>
Tested-by: Kavindya Deegala <kavindya.s.deegala@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

2 files changed, 24 insertions, 31 deletions

diff --git a/drivers/net/ethernet/intel/i40e/i40e_debugfs.c b/drivers/net/ethernet/intel/i40e/i40e_debugfs.c
index 57fc86496f30..47b9754d1e8e 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_debugfs.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_debugfs.c
@@ -1467,19 +1467,19 @@ static ssize_t i40e_dbg_command_write(struct file *filp,
                                  pf->msg_enable);
                 }
         } else if (strncmp(cmd_buf, "pfr", 3) == 0) {
-                dev_info(&pf->pdev->dev, "forcing PFR\n");
+                dev_info(&pf->pdev->dev, "debugfs: forcing PFR\n");
                 i40e_do_reset_safe(pf, (1 << __I40E_PF_RESET_REQUESTED));
 
         } else if (strncmp(cmd_buf, "corer", 5) == 0) {
-                dev_info(&pf->pdev->dev, "forcing CoreR\n");
+                dev_info(&pf->pdev->dev, "debugfs: forcing CoreR\n");
                 i40e_do_reset_safe(pf, (1 << __I40E_CORE_RESET_REQUESTED));
 
         } else if (strncmp(cmd_buf, "globr", 5) == 0) {
-                dev_info(&pf->pdev->dev, "forcing GlobR\n");
+                dev_info(&pf->pdev->dev, "debugfs: forcing GlobR\n");
                 i40e_do_reset_safe(pf, (1 << __I40E_GLOBAL_RESET_REQUESTED));
 
         } else if (strncmp(cmd_buf, "empr", 4) == 0) {
-                dev_info(&pf->pdev->dev, "forcing EMPR\n");
+                dev_info(&pf->pdev->dev, "debugfs: forcing EMPR\n");
                 i40e_do_reset_safe(pf, (1 << __I40E_EMP_RESET_REQUESTED));
 
         } else if (strncmp(cmd_buf, "read", 4) == 0) {
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index acf0b20a57bc..f7b1753ac565 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -3755,8 +3755,8 @@ static int i40e_vsi_configure_bw_alloc(struct i40e_vsi *vsi, u8 enabled_tc,
                                           NULL);
         if (aq_ret) {
                 dev_info(&vsi->back->pdev->dev,
-                         "%s: AQ command Config VSI BW allocation per TC failed = %d\n",
-                         __func__, vsi->back->hw.aq.asq_last_status);
+                         "AQ command Config VSI BW allocation per TC failed = %d\n",
+                         vsi->back->hw.aq.asq_last_status);
                 return -EINVAL;
         }
 
@@ -4364,7 +4364,7 @@ void i40e_do_reset(struct i40e_pf *pf, u32 reset_flags)
                  * for the warning interrupt will deal with the shutdown
                  * and recovery of the switch setup.
                  */
-                dev_info(&pf->pdev->dev, "GlobalR requested\n");
+                dev_dbg(&pf->pdev->dev, "GlobalR requested\n");
                 val = rd32(&pf->hw, I40E_GLGEN_RTRIG);
                 val |= I40E_GLGEN_RTRIG_GLOBR_MASK;
                 wr32(&pf->hw, I40E_GLGEN_RTRIG, val);
@@ -4375,7 +4375,7 @@ void i40e_do_reset(struct i40e_pf *pf, u32 reset_flags)
                  *
                  * Same as Global Reset, except does *not* include the MAC/PHY
                  */
-                dev_info(&pf->pdev->dev, "CoreR requested\n");
+                dev_dbg(&pf->pdev->dev, "CoreR requested\n");
                 val = rd32(&pf->hw, I40E_GLGEN_RTRIG);
                 val |= I40E_GLGEN_RTRIG_CORER_MASK;
                 wr32(&pf->hw, I40E_GLGEN_RTRIG, val);
@@ -4409,7 +4409,7 @@ void i40e_do_reset(struct i40e_pf *pf, u32 reset_flags)
                  * the switch, since we need to do all the recovery as
                  * for the Core Reset.
                  */
-                dev_info(&pf->pdev->dev, "PFR requested\n");
+                dev_dbg(&pf->pdev->dev, "PFR requested\n");
                 i40e_handle_reset_warning(pf);
 
         } else if (reset_flags & (1 << __I40E_REINIT_REQUESTED)) {
@@ -4458,18 +4458,18 @@ bool i40e_dcb_need_reconfig(struct i40e_pf *pf,
                            &old_cfg->etscfg.prioritytable,
                            sizeof(new_cfg->etscfg.prioritytable))) {
                         need_reconfig = true;
-                        dev_info(&pf->pdev->dev, "ETS UP2TC changed.\n");
+                        dev_dbg(&pf->pdev->dev, "ETS UP2TC changed.\n");
                 }
 
                 if (memcmp(&new_cfg->etscfg.tcbwtable,
                            &old_cfg->etscfg.tcbwtable,
                            sizeof(new_cfg->etscfg.tcbwtable)))
-                        dev_info(&pf->pdev->dev, "ETS TC BW Table changed.\n");
+                        dev_dbg(&pf->pdev->dev, "ETS TC BW Table changed.\n");
 
                 if (memcmp(&new_cfg->etscfg.tsatable,
                            &old_cfg->etscfg.tsatable,
                            sizeof(new_cfg->etscfg.tsatable)))
-                        dev_info(&pf->pdev->dev, "ETS TSA Table changed.\n");
+                        dev_dbg(&pf->pdev->dev, "ETS TSA Table changed.\n");
         }
 
         /* Check if PFC configuration has changed */
@@ -4477,7 +4477,7 @@ bool i40e_dcb_need_reconfig(struct i40e_pf *pf,
                    &old_cfg->pfc,
                    sizeof(new_cfg->pfc))) {
                 need_reconfig = true;
-                dev_info(&pf->pdev->dev, "PFC config change detected.\n");
+                dev_dbg(&pf->pdev->dev, "PFC config change detected.\n");
         }
 
         /* Check if APP Table has changed */
@@ -4485,7 +4485,7 @@ bool i40e_dcb_need_reconfig(struct i40e_pf *pf,
                    &old_cfg->app,
                    sizeof(new_cfg->app))) {
                 need_reconfig = true;
-                dev_info(&pf->pdev->dev, "APP Table change detected.\n");
+                dev_dbg(&pf->pdev->dev, "APP Table change detected.\n");
         }
 
         return need_reconfig;
@@ -4535,7 +4535,7 @@ static int i40e_handle_lldp_event(struct i40e_pf *pf,
 
         /* No change detected in DCBX configs */
         if (!memcmp(&tmp_dcbx_cfg, dcbx_cfg, sizeof(tmp_dcbx_cfg))) {
-                dev_info(&pf->pdev->dev, "No change detected in DCBX configuration.\n");
+                dev_dbg(&pf->pdev->dev, "No change detected in DCBX configuration.\n");
                 goto exit;
         }
 
@@ -4593,8 +4593,8 @@ static void i40e_handle_lan_overflow_event(struct i40e_pf *pf,
         struct i40e_vf *vf;
         u16 vf_id;
 
-        dev_info(&pf->pdev->dev, "%s: Rx Queue Number = %d QTX_CTL=0x%08x\n",
-                 __func__, queue, qtx_ctl);
+        dev_dbg(&pf->pdev->dev, "overflow Rx Queue Number = %d QTX_CTL=0x%08x\n",
+                queue, qtx_ctl);
 
         /* Queue belongs to VF, find the VF and issue VF reset */
         if (((qtx_ctl & I40E_QTX_CTL_PFVF_Q_MASK)
@@ -4946,7 +4946,7 @@ static void i40e_clean_adminq_subtask(struct i40e_pf *pf)
                                         event.msg_size);
                         break;
                 case i40e_aqc_opc_lldp_update_mib:
-                        dev_info(&pf->pdev->dev, "ARQ: Update LLDP MIB event received\n");
+                        dev_dbg(&pf->pdev->dev, "ARQ: Update LLDP MIB event received\n");
 #ifdef CONFIG_I40E_DCB