aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrans Pop <elendil@planet.nl>2010-03-24 03:57:35 -0400
committerDavid S. Miller <davem@davemloft.net>2010-03-24 17:10:22 -0400
commitd6dbee861386cd3f4cee62bcf28597e63e251e0c (patch)
tree191bf8cf781719d30732f48d27393d7b41978d14
parentc2bb1b9c7e862ecca2ffb20b1457034d2c401845 (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>
-rw-r--r--drivers/net/e1000/e1000_hw.c4
-rw-r--r--drivers/net/eepro.c4
-rw-r--r--drivers/net/ixgbe/ixgbe_82599.c2
-rw-r--r--drivers/net/ixgbe/ixgbe_main.c6
-rw-r--r--drivers/net/ixgbe/ixgbe_phy.c4
-rw-r--r--drivers/net/ixgbevf/ixgbevf_main.c2
6 files changed, 11 insertions, 11 deletions
diff --git a/drivers/net/e1000/e1000_hw.c b/drivers/net/e1000/e1000_hw.c
index 8d7d87f1282..e2b6e6e7ba6 100644
--- a/drivers/net/e1000/e1000_hw.c
+++ b/drivers/net/e1000/e1000_hw.c
@@ -990,7 +990,7 @@ static s32 e1000_copper_link_preconfig(struct e1000_hw *hw)
990 DEBUGOUT("Error, did not detect valid phy.\n"); 990 DEBUGOUT("Error, did not detect valid phy.\n");
991 return ret_val; 991 return ret_val;
992 } 992 }
993 DEBUGOUT1("Phy ID = %x \n", hw->phy_id); 993 DEBUGOUT1("Phy ID = %x\n", hw->phy_id);
994 994
995 /* Set PHY to class A mode (if necessary) */ 995 /* Set PHY to class A mode (if necessary) */
996 ret_val = e1000_set_phy_mode(hw); 996 ret_val = e1000_set_phy_mode(hw);
@@ -1680,7 +1680,7 @@ static s32 e1000_phy_force_speed_duplex(struct e1000_hw *hw)
1680 if (ret_val) 1680 if (ret_val)
1681 return ret_val; 1681 return ret_val;
1682 1682
1683 DEBUGOUT1("M88E1000 PSCR: %x \n", phy_data); 1683 DEBUGOUT1("M88E1000 PSCR: %x\n", phy_data);
1684 1684
1685 /* Need to reset the PHY or these changes will be ignored */ 1685 /* Need to reset the PHY or these changes will be ignored */
1686 mii_ctrl_reg |= MII_CR_RESET; 1686 mii_ctrl_reg |= MII_CR_RESET;
diff --git a/drivers/net/eepro.c b/drivers/net/eepro.c
index 1b05bdf62c3..15d6266b80c 100644
--- a/drivers/net/eepro.c
+++ b/drivers/net/eepro.c
@@ -646,7 +646,7 @@ static void __init printEEPROMInfo(struct net_device *dev)
646 if (GetBit(Word,ee_PortTPE)) printk(KERN_DEBUG "TPE "); 646 if (GetBit(Word,ee_PortTPE)) printk(KERN_DEBUG "TPE ");
647 if (GetBit(Word,ee_PortBNC)) printk(KERN_DEBUG "BNC "); 647 if (GetBit(Word,ee_PortBNC)) printk(KERN_DEBUG "BNC ");
648 if (GetBit(Word,ee_PortAUI)) printk(KERN_DEBUG "AUI "); 648 if (GetBit(Word,ee_PortAUI)) printk(KERN_DEBUG "AUI ");
649 printk(KERN_DEBUG "port(s) \n"); 649 printk(KERN_DEBUG "port(s)\n");
650 650
651 Word = lp->word[6]; 651 Word = lp->word[6];
652 printk(KERN_DEBUG "Word6:\n"); 652 printk(KERN_DEBUG "Word6:\n");
@@ -766,7 +766,7 @@ static int __init eepro_probe1(struct net_device *dev, int autoprobe)
766 /* Grab the region so we can find another board if autoIRQ fails. */ 766 /* Grab the region so we can find another board if autoIRQ fails. */
767 if (!request_region(ioaddr, EEPRO_IO_EXTENT, DRV_NAME)) { 767 if (!request_region(ioaddr, EEPRO_IO_EXTENT, DRV_NAME)) {
768 if (!autoprobe) 768 if (!autoprobe)
769 printk(KERN_WARNING "EEPRO: io-port 0x%04x in use \n", 769 printk(KERN_WARNING "EEPRO: io-port 0x%04x in use\n",
770 ioaddr); 770 ioaddr);
771 return -EBUSY; 771 return -EBUSY;
772 } 772 }
diff --git a/drivers/net/ixgbe/ixgbe_82599.c b/drivers/net/ixgbe/ixgbe_82599.c
index b405a00817c..f894bb63304 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 d75c46ff31f..7e4e9504c01 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 1c1efd38695..d6d5b843d62 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;
diff --git a/drivers/net/ixgbevf/ixgbevf_main.c b/drivers/net/ixgbevf/ixgbevf_main.c
index 19e93a43e56..7cacb124e4c 100644
--- a/drivers/net/ixgbevf/ixgbevf_main.c
+++ b/drivers/net/ixgbevf/ixgbevf_main.c
@@ -3480,7 +3480,7 @@ static int __devinit ixgbevf_probe(struct pci_dev *pdev,
3480 3480
3481 hw_dbg(hw, "MAC: %d\n", hw->mac.type); 3481 hw_dbg(hw, "MAC: %d\n", hw->mac.type);
3482 3482
3483 hw_dbg(hw, "LRO is disabled \n"); 3483 hw_dbg(hw, "LRO is disabled\n");
3484 3484
3485 hw_dbg(hw, "Intel(R) 82599 Virtual Function\n"); 3485 hw_dbg(hw, "Intel(R) 82599 Virtual Function\n");
3486 cards_found++; 3486 cards_found++;