aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/intel/i40evf/i40evf_main.c
diff options
context:
space:
mode:
authorMitch Williams <mitch.a.williams@intel.com>2014-05-10 00:49:11 -0400
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2014-06-08 05:01:53 -0400
commit63158f916f21b986743d0cb6f9e273d54a01ce7e (patch)
tree3fe02a16bded677209a3099719788c6395baceee /drivers/net/ethernet/intel/i40evf/i40evf_main.c
parentddfda80f04f139fd147f1c517e79390daa157f27 (diff)
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>
Diffstat (limited to 'drivers/net/ethernet/intel/i40evf/i40evf_main.c')
-rw-r--r--drivers/net/ethernet/intel/i40evf/i40evf_main.c13
1 files changed, 4 insertions, 9 deletions
diff --git a/drivers/net/ethernet/intel/i40evf/i40evf_main.c b/drivers/net/ethernet/intel/i40evf/i40evf_main.c
index 590a9a42775f..e32b8c58d441 100644
--- 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)
1486 for (i = 0; i < I40EVF_RESET_WAIT_COUNT; i++) { 1486 for (i = 0; i < I40EVF_RESET_WAIT_COUNT; i++) {
1487 rstat_val = rd32(hw, I40E_VFGEN_RSTAT) & 1487 rstat_val = rd32(hw, I40E_VFGEN_RSTAT) &
1488 I40E_VFGEN_RSTAT_VFR_STATE_MASK; 1488 I40E_VFGEN_RSTAT_VFR_STATE_MASK;
1489 if (rstat_val != I40E_VFR_VFACTIVE) { 1489 if (rstat_val != I40E_VFR_VFACTIVE)
1490 dev_info(&adapter->pdev->dev, "Reset now occurring\n");
1491 break; 1490 break;
1492 } else { 1491 else
1493 msleep(I40EVF_RESET_WAIT_MS); 1492 msleep(I40EVF_RESET_WAIT_MS);
1494 }
1495 } 1493 }
1496 if (i == I40EVF_RESET_WAIT_COUNT) { 1494 if (i == I40EVF_RESET_WAIT_COUNT) {
1497 dev_err(&adapter->pdev->dev, "Reset was not detected\n");
1498 adapter->flags &= ~I40EVF_FLAG_RESET_PENDING; 1495 adapter->flags &= ~I40EVF_FLAG_RESET_PENDING;
1499 goto continue_reset; /* act like the reset happened */ 1496 goto continue_reset; /* act like the reset happened */
1500 } 1497 }
@@ -1503,12 +1500,10 @@ static void i40evf_reset_task(struct work_struct *work)
1503 for (i = 0; i < I40EVF_RESET_WAIT_COUNT; i++) { 1500 for (i = 0; i < I40EVF_RESET_WAIT_COUNT; i++) {
1504 rstat_val = rd32(hw, I40E_VFGEN_RSTAT) & 1501 rstat_val = rd32(hw, I40E_VFGEN_RSTAT) &
1505 I40E_VFGEN_RSTAT_VFR_STATE_MASK; 1502 I40E_VFGEN_RSTAT_VFR_STATE_MASK;
1506 if (rstat_val == I40E_VFR_VFACTIVE) { 1503 if (rstat_val == I40E_VFR_VFACTIVE)
1507 dev_info(&adapter->pdev->dev, "Reset complete, reinitializing\n");
1508 break; 1504 break;
1509 } else { 1505 else
1510 msleep(I40EVF_RESET_WAIT_MS); 1506 msleep(I40EVF_RESET_WAIT_MS);
1511 }
1512 } 1507 }
1513 if (i == I40EVF_RESET_WAIT_COUNT) { 1508 if (i == I40EVF_RESET_WAIT_COUNT) {
1514 /* reset never finished */ 1509 /* reset never finished */