Commit c5ffe7e1 authored by Jakub Kicinski's avatar Jakub Kicinski Committed by Jeff Kirsher

e1000e/igb/ixgbe/i40e: fix message terminations

Add \n at the end of messages where missing, remove all \r.
Reported-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarJakub Kicinski <kubakici@wp.pl>
Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Tested-by: default avatarPhil Schmitt <phillip.j.schmitt@intel.com>
Tested-by: default avatarKavindya Deegala <kavindya.s.deegala@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent eda183c2
...@@ -1165,7 +1165,7 @@ static void e1000e_tx_hwtstamp_work(struct work_struct *work) ...@@ -1165,7 +1165,7 @@ static void e1000e_tx_hwtstamp_work(struct work_struct *work)
dev_kfree_skb_any(adapter->tx_hwtstamp_skb); dev_kfree_skb_any(adapter->tx_hwtstamp_skb);
adapter->tx_hwtstamp_skb = NULL; adapter->tx_hwtstamp_skb = NULL;
adapter->tx_hwtstamp_timeouts++; adapter->tx_hwtstamp_timeouts++;
e_warn("clearing Tx timestamp hang"); e_warn("clearing Tx timestamp hang\n");
} else { } else {
/* reschedule to check later */ /* reschedule to check later */
schedule_work(&adapter->tx_hwtstamp_work); schedule_work(&adapter->tx_hwtstamp_work);
......
...@@ -160,7 +160,7 @@ static i40e_status i40e_poll_sr_srctl_done_bit(struct i40e_hw *hw) ...@@ -160,7 +160,7 @@ static i40e_status i40e_poll_sr_srctl_done_bit(struct i40e_hw *hw)
udelay(5); udelay(5);
} }
if (ret_code == I40E_ERR_TIMEOUT) if (ret_code == I40E_ERR_TIMEOUT)
hw_dbg(hw, "Done bit in GLNVM_SRCTL not set"); hw_dbg(hw, "Done bit in GLNVM_SRCTL not set\n");
return ret_code; return ret_code;
} }
......
...@@ -239,7 +239,7 @@ static void i40e_ptp_tx_work(struct work_struct *work) ...@@ -239,7 +239,7 @@ static void i40e_ptp_tx_work(struct work_struct *work)
dev_kfree_skb_any(pf->ptp_tx_skb); dev_kfree_skb_any(pf->ptp_tx_skb);
pf->ptp_tx_skb = NULL; pf->ptp_tx_skb = NULL;
pf->tx_hwtstamp_timeouts++; pf->tx_hwtstamp_timeouts++;
dev_warn(&pf->pdev->dev, "clearing Tx timestamp hang"); dev_warn(&pf->pdev->dev, "clearing Tx timestamp hang\n");
return; return;
} }
...@@ -321,7 +321,7 @@ void i40e_ptp_rx_hang(struct i40e_vsi *vsi) ...@@ -321,7 +321,7 @@ void i40e_ptp_rx_hang(struct i40e_vsi *vsi)
pf->last_rx_ptp_check = jiffies; pf->last_rx_ptp_check = jiffies;
pf->rx_hwtstamp_cleared++; pf->rx_hwtstamp_cleared++;
dev_warn(&vsi->back->pdev->dev, dev_warn(&vsi->back->pdev->dev,
"%s: clearing Rx timestamp hang", "%s: clearing Rx timestamp hang\n",
__func__); __func__);
} }
} }
......
...@@ -418,7 +418,7 @@ int i40e_add_del_fdir(struct i40e_vsi *vsi, ...@@ -418,7 +418,7 @@ int i40e_add_del_fdir(struct i40e_vsi *vsi,
} }
break; break;
default: default:
dev_info(&pf->pdev->dev, "Could not specify spec type %d", dev_info(&pf->pdev->dev, "Could not specify spec type %d\n",
input->flow_type); input->flow_type);
ret = -EINVAL; ret = -EINVAL;
} }
...@@ -478,7 +478,7 @@ static void i40e_fd_handle_status(struct i40e_ring *rx_ring, ...@@ -478,7 +478,7 @@ static void i40e_fd_handle_status(struct i40e_ring *rx_ring,
pf->flags |= I40E_FLAG_FDIR_REQUIRES_REINIT; pf->flags |= I40E_FLAG_FDIR_REQUIRES_REINIT;
} }
} else { } else {
dev_info(&pdev->dev, "FD filter programming error"); dev_info(&pdev->dev, "FD filter programming error\n");
} }
} else if (error == } else if (error ==
(0x1 << I40E_RX_PROG_STATUS_DESC_NO_FD_ENTRY_SHIFT)) { (0x1 << I40E_RX_PROG_STATUS_DESC_NO_FD_ENTRY_SHIFT)) {
......
...@@ -365,7 +365,7 @@ static s32 igb_read_invm_word_i210(struct e1000_hw *hw, u8 address, u16 *data) ...@@ -365,7 +365,7 @@ static s32 igb_read_invm_word_i210(struct e1000_hw *hw, u8 address, u16 *data)
word_address = INVM_DWORD_TO_WORD_ADDRESS(invm_dword); word_address = INVM_DWORD_TO_WORD_ADDRESS(invm_dword);
if (word_address == address) { if (word_address == address) {
*data = INVM_DWORD_TO_WORD_DATA(invm_dword); *data = INVM_DWORD_TO_WORD_DATA(invm_dword);
hw_dbg("Read INVM Word 0x%02x = %x", hw_dbg("Read INVM Word 0x%02x = %x\n",
address, *data); address, *data);
status = E1000_SUCCESS; status = E1000_SUCCESS;
break; break;
......
...@@ -929,11 +929,10 @@ s32 igb_config_fc_after_link_up(struct e1000_hw *hw) ...@@ -929,11 +929,10 @@ s32 igb_config_fc_after_link_up(struct e1000_hw *hw)
*/ */
if (hw->fc.requested_mode == e1000_fc_full) { if (hw->fc.requested_mode == e1000_fc_full) {
hw->fc.current_mode = e1000_fc_full; hw->fc.current_mode = e1000_fc_full;
hw_dbg("Flow Control = FULL.\r\n"); hw_dbg("Flow Control = FULL.\n");
} else { } else {
hw->fc.current_mode = e1000_fc_rx_pause; hw->fc.current_mode = e1000_fc_rx_pause;
hw_dbg("Flow Control = " hw_dbg("Flow Control = RX PAUSE frames only.\n");
"RX PAUSE frames only.\r\n");
} }
} }
/* For receiving PAUSE frames ONLY. /* For receiving PAUSE frames ONLY.
...@@ -948,7 +947,7 @@ s32 igb_config_fc_after_link_up(struct e1000_hw *hw) ...@@ -948,7 +947,7 @@ s32 igb_config_fc_after_link_up(struct e1000_hw *hw)
(mii_nway_lp_ability_reg & NWAY_LPAR_PAUSE) && (mii_nway_lp_ability_reg & NWAY_LPAR_PAUSE) &&
(mii_nway_lp_ability_reg & NWAY_LPAR_ASM_DIR)) { (mii_nway_lp_ability_reg & NWAY_LPAR_ASM_DIR)) {
hw->fc.current_mode = e1000_fc_tx_pause; hw->fc.current_mode = e1000_fc_tx_pause;
hw_dbg("Flow Control = TX PAUSE frames only.\r\n"); hw_dbg("Flow Control = TX PAUSE frames only.\n");
} }
/* For transmitting PAUSE frames ONLY. /* For transmitting PAUSE frames ONLY.
* *
...@@ -962,7 +961,7 @@ s32 igb_config_fc_after_link_up(struct e1000_hw *hw) ...@@ -962,7 +961,7 @@ s32 igb_config_fc_after_link_up(struct e1000_hw *hw)
!(mii_nway_lp_ability_reg & NWAY_LPAR_PAUSE) && !(mii_nway_lp_ability_reg & NWAY_LPAR_PAUSE) &&
(mii_nway_lp_ability_reg & NWAY_LPAR_ASM_DIR)) { (mii_nway_lp_ability_reg & NWAY_LPAR_ASM_DIR)) {
hw->fc.current_mode = e1000_fc_rx_pause; hw->fc.current_mode = e1000_fc_rx_pause;
hw_dbg("Flow Control = RX PAUSE frames only.\r\n"); hw_dbg("Flow Control = RX PAUSE frames only.\n");
} }
/* Per the IEEE spec, at this point flow control should be /* Per the IEEE spec, at this point flow control should be
* disabled. However, we want to consider that we could * disabled. However, we want to consider that we could
...@@ -988,10 +987,10 @@ s32 igb_config_fc_after_link_up(struct e1000_hw *hw) ...@@ -988,10 +987,10 @@ s32 igb_config_fc_after_link_up(struct e1000_hw *hw)
(hw->fc.requested_mode == e1000_fc_tx_pause) || (hw->fc.requested_mode == e1000_fc_tx_pause) ||
(hw->fc.strict_ieee)) { (hw->fc.strict_ieee)) {
hw->fc.current_mode = e1000_fc_none; hw->fc.current_mode = e1000_fc_none;
hw_dbg("Flow Control = NONE.\r\n"); hw_dbg("Flow Control = NONE.\n");
} else { } else {
hw->fc.current_mode = e1000_fc_rx_pause; hw->fc.current_mode = e1000_fc_rx_pause;
hw_dbg("Flow Control = RX PAUSE frames only.\r\n"); hw_dbg("Flow Control = RX PAUSE frames only.\n");
} }
/* Now we need to do one last check... If we auto- /* Now we need to do one last check... If we auto-
......
...@@ -389,7 +389,7 @@ static void igb_ptp_tx_work(struct work_struct *work) ...@@ -389,7 +389,7 @@ static void igb_ptp_tx_work(struct work_struct *work)
adapter->ptp_tx_skb = NULL; adapter->ptp_tx_skb = NULL;
clear_bit_unlock(__IGB_PTP_TX_IN_PROGRESS, &adapter->state); clear_bit_unlock(__IGB_PTP_TX_IN_PROGRESS, &adapter->state);
adapter->tx_hwtstamp_timeouts++; adapter->tx_hwtstamp_timeouts++;
dev_warn(&adapter->pdev->dev, "clearing Tx timestamp hang"); dev_warn(&adapter->pdev->dev, "clearing Tx timestamp hang\n");
return; return;
} }
...@@ -451,7 +451,7 @@ void igb_ptp_rx_hang(struct igb_adapter *adapter) ...@@ -451,7 +451,7 @@ void igb_ptp_rx_hang(struct igb_adapter *adapter)
rd32(E1000_RXSTMPH); rd32(E1000_RXSTMPH);
adapter->last_rx_ptp_check = jiffies; adapter->last_rx_ptp_check = jiffies;
adapter->rx_hwtstamp_cleared++; adapter->rx_hwtstamp_cleared++;
dev_warn(&adapter->pdev->dev, "clearing Rx timestamp hang"); dev_warn(&adapter->pdev->dev, "clearing Rx timestamp hang\n");
} }
} }
......
...@@ -1195,7 +1195,7 @@ static s32 ixgbe_detect_eeprom_page_size_generic(struct ixgbe_hw *hw, ...@@ -1195,7 +1195,7 @@ static s32 ixgbe_detect_eeprom_page_size_generic(struct ixgbe_hw *hw,
*/ */
hw->eeprom.word_page_size = IXGBE_EEPROM_PAGE_SIZE_MAX - data[0]; hw->eeprom.word_page_size = IXGBE_EEPROM_PAGE_SIZE_MAX - data[0];
hw_dbg(hw, "Detected EEPROM page size = %d words.", hw_dbg(hw, "Detected EEPROM page size = %d words.\n",
hw->eeprom.word_page_size); hw->eeprom.word_page_size);
out: out:
return status; return status;
......
...@@ -536,7 +536,7 @@ s32 ixgbe_setup_phy_link_generic(struct ixgbe_hw *hw) ...@@ -536,7 +536,7 @@ s32 ixgbe_setup_phy_link_generic(struct ixgbe_hw *hw)
if (time_out == max_time_out) { if (time_out == max_time_out) {
status = IXGBE_ERR_LINK_SETUP; status = IXGBE_ERR_LINK_SETUP;
hw_dbg(hw, "ixgbe_setup_phy_link_generic: time out"); hw_dbg(hw, "ixgbe_setup_phy_link_generic: time out\n");
} }
return status; return status;
...@@ -745,7 +745,7 @@ s32 ixgbe_setup_phy_link_tnx(struct ixgbe_hw *hw) ...@@ -745,7 +745,7 @@ s32 ixgbe_setup_phy_link_tnx(struct ixgbe_hw *hw)
if (time_out == max_time_out) { if (time_out == max_time_out) {
status = IXGBE_ERR_LINK_SETUP; status = IXGBE_ERR_LINK_SETUP;
hw_dbg(hw, "ixgbe_setup_phy_link_tnx: time out"); hw_dbg(hw, "ixgbe_setup_phy_link_tnx: time out\n");
} }
return status; return status;
...@@ -1175,7 +1175,7 @@ s32 ixgbe_identify_sfp_module_generic(struct ixgbe_hw *hw) ...@@ -1175,7 +1175,7 @@ s32 ixgbe_identify_sfp_module_generic(struct ixgbe_hw *hw)
status = 0; status = 0;
} else { } else {
if (hw->allow_unsupported_sfp) { if (hw->allow_unsupported_sfp) {
e_warn(drv, "WARNING: Intel (R) Network Connections are quality tested using Intel (R) Ethernet Optics. Using untested modules is not supported and may cause unstable operation or damage to the module or the adapter. Intel Corporation is not responsible for any harm caused by using untested modules."); e_warn(drv, "WARNING: Intel (R) Network Connections are quality tested using Intel (R) Ethernet Optics. Using untested modules is not supported and may cause unstable operation or damage to the module or the adapter. Intel Corporation is not responsible for any harm caused by using untested modules.\n");
status = 0; status = 0;
} else { } else {
hw_dbg(hw, hw_dbg(hw,
......
...@@ -456,7 +456,7 @@ void ixgbe_ptp_rx_hang(struct ixgbe_adapter *adapter) ...@@ -456,7 +456,7 @@ void ixgbe_ptp_rx_hang(struct ixgbe_adapter *adapter)
IXGBE_READ_REG(hw, IXGBE_RXSTMPH); IXGBE_READ_REG(hw, IXGBE_RXSTMPH);
adapter->last_rx_ptp_check = jiffies; adapter->last_rx_ptp_check = jiffies;
e_warn(drv, "clearing RX Timestamp hang"); e_warn(drv, "clearing RX Timestamp hang\n");
} }
} }
...@@ -512,7 +512,7 @@ static void ixgbe_ptp_tx_hwtstamp_work(struct work_struct *work) ...@@ -512,7 +512,7 @@ static void ixgbe_ptp_tx_hwtstamp_work(struct work_struct *work)
dev_kfree_skb_any(adapter->ptp_tx_skb); dev_kfree_skb_any(adapter->ptp_tx_skb);
adapter->ptp_tx_skb = NULL; adapter->ptp_tx_skb = NULL;
clear_bit_unlock(__IXGBE_PTP_TX_IN_PROGRESS, &adapter->state); clear_bit_unlock(__IXGBE_PTP_TX_IN_PROGRESS, &adapter->state);
e_warn(drv, "clearing Tx Timestamp hang"); e_warn(drv, "clearing Tx Timestamp hang\n");
return; return;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment