diff options
author | Frans Pop <elendil@planet.nl> | 2010-03-24 03:57:35 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-03-24 17:10:22 -0400 |
commit | d6dbee861386cd3f4cee62bcf28597e63e251e0c (patch) | |
tree | 191bf8cf781719d30732f48d27393d7b41978d14 /drivers/net/ixgbe | |
parent | c2bb1b9c7e862ecca2ffb20b1457034d2c401845 (diff) |
net/intel: remove trailing space in messages
Includes one minor indentation fix to placate checkpatch.
Signed-off-by: Frans Pop <elendil@planet.nl>
Cc: e1000-devel@lists.sourceforge.net
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ixgbe')
-rw-r--r-- | drivers/net/ixgbe/ixgbe_82599.c | 2 | ||||
-rw-r--r-- | drivers/net/ixgbe/ixgbe_main.c | 6 | ||||
-rw-r--r-- | drivers/net/ixgbe/ixgbe_phy.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/ixgbe/ixgbe_82599.c b/drivers/net/ixgbe/ixgbe_82599.c index b405a00817c6..f894bb633040 100644 --- a/drivers/net/ixgbe/ixgbe_82599.c +++ b/drivers/net/ixgbe/ixgbe_82599.c | |||
@@ -1269,7 +1269,7 @@ s32 ixgbe_reinit_fdir_tables_82599(struct ixgbe_hw *hw) | |||
1269 | } | 1269 | } |
1270 | if (i >= IXGBE_FDIRCMD_CMD_POLL) { | 1270 | if (i >= IXGBE_FDIRCMD_CMD_POLL) { |
1271 | hw_dbg(hw ,"Flow Director previous command isn't complete, " | 1271 | hw_dbg(hw ,"Flow Director previous command isn't complete, " |
1272 | "aborting table re-initialization. \n"); | 1272 | "aborting table re-initialization.\n"); |
1273 | return IXGBE_ERR_FDIR_REINIT_FAILED; | 1273 | return IXGBE_ERR_FDIR_REINIT_FAILED; |
1274 | } | 1274 | } |
1275 | 1275 | ||
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c index d75c46ff31f6..7e4e9504c012 100644 --- a/drivers/net/ixgbe/ixgbe_main.c +++ b/drivers/net/ixgbe/ixgbe_main.c | |||
@@ -3460,12 +3460,12 @@ static inline bool ixgbe_set_fcoe_queues(struct ixgbe_adapter *adapter) | |||
3460 | adapter->num_tx_queues = 1; | 3460 | adapter->num_tx_queues = 1; |
3461 | #ifdef CONFIG_IXGBE_DCB | 3461 | #ifdef CONFIG_IXGBE_DCB |
3462 | if (adapter->flags & IXGBE_FLAG_DCB_ENABLED) { | 3462 | if (adapter->flags & IXGBE_FLAG_DCB_ENABLED) { |
3463 | DPRINTK(PROBE, INFO, "FCoE enabled with DCB \n"); | 3463 | DPRINTK(PROBE, INFO, "FCoE enabled with DCB\n"); |
3464 | ixgbe_set_dcb_queues(adapter); | 3464 | ixgbe_set_dcb_queues(adapter); |
3465 | } | 3465 | } |
3466 | #endif | 3466 | #endif |
3467 | if (adapter->flags & IXGBE_FLAG_RSS_ENABLED) { | 3467 | if (adapter->flags & IXGBE_FLAG_RSS_ENABLED) { |
3468 | DPRINTK(PROBE, INFO, "FCoE enabled with RSS \n"); | 3468 | DPRINTK(PROBE, INFO, "FCoE enabled with RSS\n"); |
3469 | if ((adapter->flags & IXGBE_FLAG_FDIR_HASH_CAPABLE) || | 3469 | if ((adapter->flags & IXGBE_FLAG_FDIR_HASH_CAPABLE) || |
3470 | (adapter->flags & IXGBE_FLAG_FDIR_PERFECT_CAPABLE)) | 3470 | (adapter->flags & IXGBE_FLAG_FDIR_PERFECT_CAPABLE)) |
3471 | ixgbe_set_fdir_queues(adapter); | 3471 | ixgbe_set_fdir_queues(adapter); |
@@ -5081,7 +5081,7 @@ static void ixgbe_fdir_reinit_task(struct work_struct *work) | |||
5081 | &(adapter->tx_ring[i]->reinit_state)); | 5081 | &(adapter->tx_ring[i]->reinit_state)); |
5082 | } else { | 5082 | } else { |
5083 | DPRINTK(PROBE, ERR, "failed to finish FDIR re-initialization, " | 5083 | DPRINTK(PROBE, ERR, "failed to finish FDIR re-initialization, " |
5084 | "ignored adding FDIR ATR filters \n"); | 5084 | "ignored adding FDIR ATR filters\n"); |
5085 | } | 5085 | } |
5086 | /* Done FDIR Re-initialization, enable transmits */ | 5086 | /* Done FDIR Re-initialization, enable transmits */ |
5087 | netif_tx_start_all_queues(adapter->netdev); | 5087 | netif_tx_start_all_queues(adapter->netdev); |
diff --git a/drivers/net/ixgbe/ixgbe_phy.c b/drivers/net/ixgbe/ixgbe_phy.c index 1c1efd386956..d6d5b843d625 100644 --- a/drivers/net/ixgbe/ixgbe_phy.c +++ b/drivers/net/ixgbe/ixgbe_phy.c | |||
@@ -475,7 +475,7 @@ s32 ixgbe_reset_phy_nl(struct ixgbe_hw *hw) | |||
475 | msleep(edata); | 475 | msleep(edata); |
476 | break; | 476 | break; |
477 | case IXGBE_DATA_NL: | 477 | case IXGBE_DATA_NL: |
478 | hw_dbg(hw, "DATA: \n"); | 478 | hw_dbg(hw, "DATA:\n"); |
479 | data_offset++; | 479 | data_offset++; |
480 | hw->eeprom.ops.read(hw, data_offset++, | 480 | hw->eeprom.ops.read(hw, data_offset++, |
481 | &phy_offset); | 481 | &phy_offset); |
@@ -491,7 +491,7 @@ s32 ixgbe_reset_phy_nl(struct ixgbe_hw *hw) | |||
491 | break; | 491 | break; |
492 | case IXGBE_CONTROL_NL: | 492 | case IXGBE_CONTROL_NL: |
493 | data_offset++; | 493 | data_offset++; |
494 | hw_dbg(hw, "CONTROL: \n"); | 494 | hw_dbg(hw, "CONTROL:\n"); |
495 | if (edata == IXGBE_CONTROL_EOL_NL) { | 495 | if (edata == IXGBE_CONTROL_EOL_NL) { |
496 | hw_dbg(hw, "EOL\n"); | 496 | hw_dbg(hw, "EOL\n"); |
497 | end_data = true; | 497 | end_data = true; |