aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/intel/i40evf
diff options
context:
space:
mode:
authorMitch Williams <mitch.a.williams@intel.com>2014-05-10 00:49:06 -0400
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2014-06-08 05:01:34 -0400
commit80e7289356cdba946dbf1563f7d73f46d5115248 (patch)
tree57344dd85a00c5a50aab414b38ec0e4b0ec4bdab /drivers/net/ethernet/intel/i40evf
parent635ae1e3f55f215648b086855a83ab42361af4cd (diff)
i40evf: clean up log message formatting
Clean up inconsistent log messages, mostly related to punctuation. Based on the dogma that "kernel messages are not sentences", remove all trailing periods. Reword a few of the messages to make them less sentence-like. Change-ID: Ibd849aa7623a77549b0709988c66ab05d1311472 Signed-off-by: Mitch Williams <mitch.a.williams@intel.com> Tested-by: Sibai Li <sibai.li@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/ethernet/intel/i40evf')
-rw-r--r--drivers/net/ethernet/intel/i40evf/i40evf_main.c14
-rw-r--r--drivers/net/ethernet/intel/i40evf/i40evf_virtchnl.c14
2 files changed, 14 insertions, 14 deletions
diff --git a/drivers/net/ethernet/intel/i40evf/i40evf_main.c b/drivers/net/ethernet/intel/i40evf/i40evf_main.c
index c8ad8385d271..5fd60ddb8dda 100644
--- a/drivers/net/ethernet/intel/i40evf/i40evf_main.c
+++ b/drivers/net/ethernet/intel/i40evf/i40evf_main.c
@@ -1028,7 +1028,7 @@ i40evf_acquire_msix_vectors(struct i40evf_adapter *adapter, int vectors)
1028 err = pci_enable_msix_range(adapter->pdev, adapter->msix_entries, 1028 err = pci_enable_msix_range(adapter->pdev, adapter->msix_entries,
1029 vector_threshold, vectors); 1029 vector_threshold, vectors);
1030 if (err < 0) { 1030 if (err < 0) {
1031 dev_err(&adapter->pdev->dev, "Unable to allocate MSI-X interrupts.\n"); 1031 dev_err(&adapter->pdev->dev, "Unable to allocate MSI-X interrupts\n");
1032 kfree(adapter->msix_entries); 1032 kfree(adapter->msix_entries);
1033 adapter->msix_entries = NULL; 1033 adapter->msix_entries = NULL;
1034 return err; 1034 return err;
@@ -1504,7 +1504,7 @@ static void i40evf_reset_task(struct work_struct *work)
1504 rstat_val = rd32(hw, I40E_VFGEN_RSTAT) & 1504 rstat_val = rd32(hw, I40E_VFGEN_RSTAT) &
1505 I40E_VFGEN_RSTAT_VFR_STATE_MASK; 1505 I40E_VFGEN_RSTAT_VFR_STATE_MASK;
1506 if (rstat_val == I40E_VFR_VFACTIVE) { 1506 if (rstat_val == I40E_VFR_VFACTIVE) {
1507 dev_info(&adapter->pdev->dev, "Reset is complete. Reinitializing.\n"); 1507 dev_info(&adapter->pdev->dev, "Reset complete, reinitializing\n");
1508 break; 1508 break;
1509 } else { 1509 } else {
1510 msleep(I40EVF_RESET_WAIT_MS); 1510 msleep(I40EVF_RESET_WAIT_MS);
@@ -1512,7 +1512,7 @@ static void i40evf_reset_task(struct work_struct *work)
1512 } 1512 }
1513 if (i == I40EVF_RESET_WAIT_COUNT) { 1513 if (i == I40EVF_RESET_WAIT_COUNT) {
1514 /* reset never finished */ 1514 /* reset never finished */
1515 dev_err(&adapter->pdev->dev, "Reset never finished (%x). PF driver is dead, and so am I.\n", 1515 dev_err(&adapter->pdev->dev, "Reset never finished (%x)\n",
1516 rstat_val); 1516 rstat_val);
1517 adapter->flags |= I40EVF_FLAG_PF_COMMS_FAILED; 1517 adapter->flags |= I40EVF_FLAG_PF_COMMS_FAILED;
1518 1518
@@ -1577,7 +1577,7 @@ continue_reset:
1577 } 1577 }
1578 return; 1578 return;
1579reset_err: 1579reset_err:
1580 dev_err(&adapter->pdev->dev, "failed to allocate resources during reinit.\n"); 1580 dev_err(&adapter->pdev->dev, "failed to allocate resources during reinit\n");
1581 i40evf_close(adapter->netdev); 1581 i40evf_close(adapter->netdev);
1582} 1582}
1583 1583
@@ -1856,7 +1856,7 @@ void i40evf_reinit_locked(struct i40evf_adapter *adapter)
1856 return; 1856 return;
1857 1857
1858err_reinit: 1858err_reinit:
1859 dev_err(&adapter->pdev->dev, "failed to allocate resources during reinit.\n"); 1859 dev_err(&adapter->pdev->dev, "failed to allocate resources during reinit\n");
1860 i40evf_close(netdev); 1860 i40evf_close(netdev);
1861} 1861}
1862 1862
@@ -1977,7 +1977,7 @@ static void i40evf_init_task(struct work_struct *work)
1977 break; 1977 break;
1978 case __I40EVF_INIT_VERSION_CHECK: 1978 case __I40EVF_INIT_VERSION_CHECK:
1979 if (!i40evf_asq_done(hw)) { 1979 if (!i40evf_asq_done(hw)) {
1980 dev_err(&pdev->dev, "Admin queue command never completed.\n"); 1980 dev_err(&pdev->dev, "Admin queue command never completed\n");
1981 goto err; 1981 goto err;
1982 } 1982 }
1983 1983
@@ -2140,7 +2140,7 @@ err_alloc:
2140err: 2140err:
2141 /* Things went into the weeds, so try again later */ 2141 /* Things went into the weeds, so try again later */
2142 if (++adapter->aq_wait_count > I40EVF_AQ_MAX_ERR) { 2142 if (++adapter->aq_wait_count > I40EVF_AQ_MAX_ERR) {
2143 dev_err(&pdev->dev, "Failed to communicate with PF; giving up.\n"); 2143 dev_err(&pdev->dev, "Failed to communicate with PF; giving up\n");
2144 adapter->flags |= I40EVF_FLAG_PF_COMMS_FAILED; 2144 adapter->flags |= I40EVF_FLAG_PF_COMMS_FAILED;
2145 return; /* do not reschedule */ 2145 return; /* do not reschedule */
2146 } 2146 }
diff --git a/drivers/net/ethernet/intel/i40evf/i40evf_virtchnl.c b/drivers/net/ethernet/intel/i40evf/i40evf_virtchnl.c
index 13faacdfabba..cd414dac7553 100644
--- a/drivers/net/ethernet/intel/i40evf/i40evf_virtchnl.c
+++ b/drivers/net/ethernet/intel/i40evf/i40evf_virtchnl.c
@@ -388,7 +388,7 @@ void i40evf_add_ether_addrs(struct i40evf_adapter *adapter)
388 len = sizeof(struct i40e_virtchnl_ether_addr_list) + 388 len = sizeof(struct i40e_virtchnl_ether_addr_list) +
389 (count * sizeof(struct i40e_virtchnl_ether_addr)); 389 (count * sizeof(struct i40e_virtchnl_ether_addr));
390 if (len > I40EVF_MAX_AQ_BUF_SIZE) { 390 if (len > I40EVF_MAX_AQ_BUF_SIZE) {
391 dev_warn(&adapter->pdev->dev, "%s: Too many MAC address changes in one request.\n", 391 dev_warn(&adapter->pdev->dev, "%s: Too many MAC address changes in one request\n",
392 __func__); 392 __func__);
393 count = (I40EVF_MAX_AQ_BUF_SIZE - 393 count = (I40EVF_MAX_AQ_BUF_SIZE -
394 sizeof(struct i40e_virtchnl_ether_addr_list)) / 394 sizeof(struct i40e_virtchnl_ether_addr_list)) /
@@ -450,7 +450,7 @@ void i40evf_del_ether_addrs(struct i40evf_adapter *adapter)
450 len = sizeof(struct i40e_virtchnl_ether_addr_list) + 450 len = sizeof(struct i40e_virtchnl_ether_addr_list) +
451 (count * sizeof(struct i40e_virtchnl_ether_addr)); 451 (count * sizeof(struct i40e_virtchnl_ether_addr));
452 if (len > I40EVF_MAX_AQ_BUF_SIZE) { 452 if (len > I40EVF_MAX_AQ_BUF_SIZE) {
453 dev_warn(&adapter->pdev->dev, "%s: Too many MAC address changes in one request.\n", 453 dev_warn(&adapter->pdev->dev, "%s: Too many MAC address changes in one request\n",
454 __func__); 454 __func__);
455 count = (I40EVF_MAX_AQ_BUF_SIZE - 455 count = (I40EVF_MAX_AQ_BUF_SIZE -
456 sizeof(struct i40e_virtchnl_ether_addr_list)) / 456 sizeof(struct i40e_virtchnl_ether_addr_list)) /
@@ -512,7 +512,7 @@ void i40evf_add_vlans(struct i40evf_adapter *adapter)
512 len = sizeof(struct i40e_virtchnl_vlan_filter_list) + 512 len = sizeof(struct i40e_virtchnl_vlan_filter_list) +
513 (count * sizeof(u16)); 513 (count * sizeof(u16));
514 if (len > I40EVF_MAX_AQ_BUF_SIZE) { 514 if (len > I40EVF_MAX_AQ_BUF_SIZE) {
515 dev_warn(&adapter->pdev->dev, "%s: Too many VLAN changes in one request.\n", 515 dev_warn(&adapter->pdev->dev, "%s: Too many VLAN changes in one request\n",
516 __func__); 516 __func__);
517 count = (I40EVF_MAX_AQ_BUF_SIZE - 517 count = (I40EVF_MAX_AQ_BUF_SIZE -
518 sizeof(struct i40e_virtchnl_vlan_filter_list)) / 518 sizeof(struct i40e_virtchnl_vlan_filter_list)) /
@@ -572,7 +572,7 @@ void i40evf_del_vlans(struct i40evf_adapter *adapter)
572 len = sizeof(struct i40e_virtchnl_vlan_filter_list) + 572 len = sizeof(struct i40e_virtchnl_vlan_filter_list) +
573 (count * sizeof(u16)); 573 (count * sizeof(u16));
574 if (len > I40EVF_MAX_AQ_BUF_SIZE) { 574 if (len > I40EVF_MAX_AQ_BUF_SIZE) {
575 dev_warn(&adapter->pdev->dev, "%s: Too many VLAN changes in one request.\n", 575 dev_warn(&adapter->pdev->dev, "%s: Too many VLAN changes in one request\n",
576 __func__); 576 __func__);
577 count = (I40EVF_MAX_AQ_BUF_SIZE - 577 count = (I40EVF_MAX_AQ_BUF_SIZE -
578 sizeof(struct i40e_virtchnl_vlan_filter_list)) / 578 sizeof(struct i40e_virtchnl_vlan_filter_list)) /
@@ -711,7 +711,7 @@ void i40evf_virtchnl_completion(struct i40evf_adapter *adapter,
711 return; 711 return;
712 } 712 }
713 if (v_opcode != adapter->current_op) { 713 if (v_opcode != adapter->current_op) {
714 dev_err(&adapter->pdev->dev, "%s: Pending op is %d, received %d.\n", 714 dev_err(&adapter->pdev->dev, "%s: Pending op is %d, received %d\n",
715 __func__, adapter->current_op, v_opcode); 715 __func__, adapter->current_op, v_opcode);
716 /* We're probably completely screwed at this point, but clear 716 /* We're probably completely screwed at this point, but clear
717 * the current op and try to carry on.... 717 * the current op and try to carry on....
@@ -720,7 +720,7 @@ void i40evf_virtchnl_completion(struct i40evf_adapter *adapter,
720 return; 720 return;
721 } 721 }
722 if (v_retval) { 722 if (v_retval) {
723 dev_err(&adapter->pdev->dev, "%s: PF returned error %d to our request %d!\n", 723 dev_err(&adapter->pdev->dev, "%s: PF returned error %d to our request %d\n",
724 __func__, v_retval, v_opcode); 724 __func__, v_retval, v_opcode);
725 } 725 }
726 switch (v_opcode) { 726 switch (v_opcode) {
@@ -770,7 +770,7 @@ void i40evf_virtchnl_completion(struct i40evf_adapter *adapter,
770 adapter->aq_pending &= ~(I40EVF_FLAG_AQ_MAP_VECTORS); 770 adapter->aq_pending &= ~(I40EVF_FLAG_AQ_MAP_VECTORS);
771 break; 771 break;
772 default: 772 default:
773 dev_warn(&adapter->pdev->dev, "%s: Received unexpected message %d from PF.\n", 773 dev_warn(&adapter->pdev->dev, "%s: Received unexpected message %d from PF\n",
774 __func__, v_opcode); 774 __func__, v_opcode);
775 break; 775 break;
776 } /* switch v_opcode */ 776 } /* switch v_opcode */