i40e/i40evf: remove chatty reset messages

Both the PF side and the VF side of the VF reset process are too noisy.
We already warn the user that a reset is happening, and that is
sufficient.

Because some of these message are inside if statements, we have to
rejigger the brackets at the same time to keep our coding style
consistent.

Change-ID: Id175562fb0ec7c396d9de156b4890e136f52d5f4
Signed-off-by: Mitch Williams <mitch.a.williams@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index 45027342c81c746f0f4ef361ce47fd0d7c236a04..566eec10215f802e05e7ecb4e56c64a6ece6bd47 100644 (file)
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -5623,8 +5623,6 @@ static void i40e_reset_and_rebuild(struct i40e_pf *pf, bool reinit)
        /* tell the firmware that we're starting */
        i40e_send_version(pf);
 
-       dev_info(&pf->pdev->dev, "reset complete\n");
-
 end_core_reset:
        clear_bit(__I40E_RESET_RECOVERY_PENDING, &pf->state);
 }

diff --git a/drivers/net/ethernet/intel/i40evf/i40evf_main.c b/drivers/net/ethernet/intel/i40evf/i40evf_main.c
index 590a9a42775f4a019061d8c639c7838c106c5f13..e32b8c58d441b9eca258e44e488d29f22711a08b 100644 (file)
--- a/drivers/net/ethernet/intel/i40evf/i40evf_main.c
+++ b/drivers/net/ethernet/intel/i40evf/i40evf_main.c
@@ -1486,15 +1486,12 @@ static void i40evf_reset_task(struct work_struct *work)
        for (i = 0; i < I40EVF_RESET_WAIT_COUNT; i++) {
                rstat_val = rd32(hw, I40E_VFGEN_RSTAT) &
                            I40E_VFGEN_RSTAT_VFR_STATE_MASK;
-               if (rstat_val != I40E_VFR_VFACTIVE) {
-                       dev_info(&adapter->pdev->dev, "Reset now occurring\n");
+               if (rstat_val != I40E_VFR_VFACTIVE)
                        break;
-               } else {
+               else
                        msleep(I40EVF_RESET_WAIT_MS);
-               }
        }
        if (i == I40EVF_RESET_WAIT_COUNT) {
-               dev_err(&adapter->pdev->dev, "Reset was not detected\n");
                adapter->flags &= ~I40EVF_FLAG_RESET_PENDING;
                goto continue_reset; /* act like the reset happened */
        }
@@ -1503,12 +1500,10 @@ static void i40evf_reset_task(struct work_struct *work)
        for (i = 0; i < I40EVF_RESET_WAIT_COUNT; i++) {
                rstat_val = rd32(hw, I40E_VFGEN_RSTAT) &
                            I40E_VFGEN_RSTAT_VFR_STATE_MASK;
-               if (rstat_val == I40E_VFR_VFACTIVE) {
-                       dev_info(&adapter->pdev->dev, "Reset complete, reinitializing\n");
+               if (rstat_val == I40E_VFR_VFACTIVE)
                        break;
-               } else {
+               else
                        msleep(I40EVF_RESET_WAIT_MS);
-               }
        }
        if (i == I40EVF_RESET_WAIT_COUNT) {
                /* reset never finished */