i40evf: clean up log message formatting
authorMitch Williams <mitch.a.williams@intel.com>
Sat, 10 May 2014 04:49:06 +0000 (04:49 +0000)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Sun, 8 Jun 2014 09:01:34 +0000 (02:01 -0700)
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>
drivers/net/ethernet/intel/i40evf/i40evf_main.c
drivers/net/ethernet/intel/i40evf/i40evf_virtchnl.c

index c8ad8385d271a594adb523701e397e7a9b8947c5..5fd60ddb8ddabce62cafc2660925ec2037ac2083 100644 (file)
@@ -1028,7 +1028,7 @@ i40evf_acquire_msix_vectors(struct i40evf_adapter *adapter, int vectors)
        err = pci_enable_msix_range(adapter->pdev, adapter->msix_entries,
                                    vector_threshold, vectors);
        if (err < 0) {
-               dev_err(&adapter->pdev->dev, "Unable to allocate MSI-X interrupts.\n");
+               dev_err(&adapter->pdev->dev, "Unable to allocate MSI-X interrupts\n");
                kfree(adapter->msix_entries);
                adapter->msix_entries = NULL;
                return err;
@@ -1504,7 +1504,7 @@ static void i40evf_reset_task(struct work_struct *work)
                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 is complete. Reinitializing.\n");
+                       dev_info(&adapter->pdev->dev, "Reset complete, reinitializing\n");
                        break;
                } else {
                        msleep(I40EVF_RESET_WAIT_MS);
@@ -1512,7 +1512,7 @@ static void i40evf_reset_task(struct work_struct *work)
        }
        if (i == I40EVF_RESET_WAIT_COUNT) {
                /* reset never finished */
-               dev_err(&adapter->pdev->dev, "Reset never finished (%x). PF driver is dead, and so am I.\n",
+               dev_err(&adapter->pdev->dev, "Reset never finished (%x)\n",
                        rstat_val);
                adapter->flags |= I40EVF_FLAG_PF_COMMS_FAILED;
 
@@ -1577,7 +1577,7 @@ continue_reset:
        }
        return;
 reset_err:
-       dev_err(&adapter->pdev->dev, "failed to allocate resources during reinit.\n");
+       dev_err(&adapter->pdev->dev, "failed to allocate resources during reinit\n");
        i40evf_close(adapter->netdev);
 }
 
@@ -1856,7 +1856,7 @@ void i40evf_reinit_locked(struct i40evf_adapter *adapter)
        return;
 
 err_reinit:
-       dev_err(&adapter->pdev->dev, "failed to allocate resources during reinit.\n");
+       dev_err(&adapter->pdev->dev, "failed to allocate resources during reinit\n");
        i40evf_close(netdev);
 }
 
@@ -1977,7 +1977,7 @@ static void i40evf_init_task(struct work_struct *work)
                break;
        case __I40EVF_INIT_VERSION_CHECK:
                if (!i40evf_asq_done(hw)) {
-                       dev_err(&pdev->dev, "Admin queue command never completed.\n");
+                       dev_err(&pdev->dev, "Admin queue command never completed\n");
                        goto err;
                }
 
@@ -2140,7 +2140,7 @@ err_alloc:
 err:
        /* Things went into the weeds, so try again later */
        if (++adapter->aq_wait_count > I40EVF_AQ_MAX_ERR) {
-               dev_err(&pdev->dev, "Failed to communicate with PF; giving up.\n");
+               dev_err(&pdev->dev, "Failed to communicate with PF; giving up\n");
                adapter->flags |= I40EVF_FLAG_PF_COMMS_FAILED;
                return; /* do not reschedule */
        }
index 13faacdfabba2f90166de71f8a1c21aaba0f80b6..cd414dac7553abcb32278de365de661f6ace8c72 100644 (file)
@@ -388,7 +388,7 @@ void i40evf_add_ether_addrs(struct i40evf_adapter *adapter)
        len = sizeof(struct i40e_virtchnl_ether_addr_list) +
              (count * sizeof(struct i40e_virtchnl_ether_addr));
        if (len > I40EVF_MAX_AQ_BUF_SIZE) {
-               dev_warn(&adapter->pdev->dev, "%s: Too many MAC address changes in one request.\n",
+               dev_warn(&adapter->pdev->dev, "%s: Too many MAC address changes in one request\n",
                        __func__);
                count = (I40EVF_MAX_AQ_BUF_SIZE -
                         sizeof(struct i40e_virtchnl_ether_addr_list)) /
@@ -450,7 +450,7 @@ void i40evf_del_ether_addrs(struct i40evf_adapter *adapter)
        len = sizeof(struct i40e_virtchnl_ether_addr_list) +
              (count * sizeof(struct i40e_virtchnl_ether_addr));
        if (len > I40EVF_MAX_AQ_BUF_SIZE) {
-               dev_warn(&adapter->pdev->dev, "%s: Too many MAC address changes in one request.\n",
+               dev_warn(&adapter->pdev->dev, "%s: Too many MAC address changes in one request\n",
                        __func__);
                count = (I40EVF_MAX_AQ_BUF_SIZE -
                         sizeof(struct i40e_virtchnl_ether_addr_list)) /
@@ -512,7 +512,7 @@ void i40evf_add_vlans(struct i40evf_adapter *adapter)
        len = sizeof(struct i40e_virtchnl_vlan_filter_list) +
              (count * sizeof(u16));
        if (len > I40EVF_MAX_AQ_BUF_SIZE) {
-               dev_warn(&adapter->pdev->dev, "%s: Too many VLAN changes in one request.\n",
+               dev_warn(&adapter->pdev->dev, "%s: Too many VLAN changes in one request\n",
                        __func__);
                count = (I40EVF_MAX_AQ_BUF_SIZE -
                         sizeof(struct i40e_virtchnl_vlan_filter_list)) /
@@ -572,7 +572,7 @@ void i40evf_del_vlans(struct i40evf_adapter *adapter)
        len = sizeof(struct i40e_virtchnl_vlan_filter_list) +
              (count * sizeof(u16));
        if (len > I40EVF_MAX_AQ_BUF_SIZE) {
-               dev_warn(&adapter->pdev->dev, "%s: Too many VLAN changes in one request.\n",
+               dev_warn(&adapter->pdev->dev, "%s: Too many VLAN changes in one request\n",
                        __func__);
                count = (I40EVF_MAX_AQ_BUF_SIZE -
                         sizeof(struct i40e_virtchnl_vlan_filter_list)) /
@@ -711,7 +711,7 @@ void i40evf_virtchnl_completion(struct i40evf_adapter *adapter,
                return;
        }
        if (v_opcode != adapter->current_op) {
-               dev_err(&adapter->pdev->dev, "%s: Pending op is %d, received %d.\n",
+               dev_err(&adapter->pdev->dev, "%s: Pending op is %d, received %d\n",
                        __func__, adapter->current_op, v_opcode);
                /* We're probably completely screwed at this point, but clear
                 * the current op and try to carry on....
@@ -720,7 +720,7 @@ void i40evf_virtchnl_completion(struct i40evf_adapter *adapter,
                return;
        }
        if (v_retval) {
-               dev_err(&adapter->pdev->dev, "%s: PF returned error %d to our request %d!\n",
+               dev_err(&adapter->pdev->dev, "%s: PF returned error %d to our request %d\n",
                        __func__, v_retval, v_opcode);
        }
        switch (v_opcode) {
@@ -770,7 +770,7 @@ void i40evf_virtchnl_completion(struct i40evf_adapter *adapter,
                adapter->aq_pending &= ~(I40EVF_FLAG_AQ_MAP_VECTORS);
                break;
        default:
-               dev_warn(&adapter->pdev->dev, "%s: Received unexpected message %d from PF.\n",
+               dev_warn(&adapter->pdev->dev, "%s: Received unexpected message %d from PF\n",
                        __func__, v_opcode);
                break;
        } /* switch v_opcode */