diff options
author | Bruce Allan <bruce.w.allan@intel.com> | 2013-01-11 22:11:25 -0500 |
---|---|---|
committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2013-01-16 03:01:50 -0500 |
commit | 7dbc1672f155958e2f548a29caea709a136ed0f2 (patch) | |
tree | 903dd38b6d5543b92abe3cb37f8df09743d9bab3 | |
parent | 8e5ab42d7fdd73b11a6b6b58b4a7b26931c73385 (diff) |
e1000e: resolve checkpatch PREFER_PR_LEVEL warning
WARNING: Prefer netdev_info(netdev, ... then dev_info(dev, ...
then pr_info(... to printk(KERN_INFO ...
v2 - remove unnecessary "e1000e:" prefix as pointed out by Joe Perches
since that produces a redundant "e1000e:" in the log message
Cc: Joe Perches <joe@perches.com>
Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
-rw-r--r-- | drivers/net/ethernet/intel/e1000e/netdev.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c index 7ad8ef639cea..b22eb049e27d 100644 --- a/drivers/net/ethernet/intel/e1000e/netdev.c +++ b/drivers/net/ethernet/intel/e1000e/netdev.c | |||
@@ -4300,9 +4300,8 @@ static void e1000_print_link_info(struct e1000_adapter *adapter) | |||
4300 | u32 ctrl = er32(CTRL); | 4300 | u32 ctrl = er32(CTRL); |
4301 | 4301 | ||
4302 | /* Link status message must follow this format for user tools */ | 4302 | /* Link status message must follow this format for user tools */ |
4303 | printk(KERN_INFO "e1000e: %s NIC Link is Up %d Mbps %s Duplex, Flow Control: %s\n", | 4303 | pr_info("%s NIC Link is Up %d Mbps %s Duplex, Flow Control: %s\n", |
4304 | adapter->netdev->name, | 4304 | adapter->netdev->name, adapter->link_speed, |
4305 | adapter->link_speed, | ||
4306 | adapter->link_duplex == FULL_DUPLEX ? "Full" : "Half", | 4305 | adapter->link_duplex == FULL_DUPLEX ? "Full" : "Half", |
4307 | (ctrl & E1000_CTRL_TFCE) && (ctrl & E1000_CTRL_RFCE) ? "Rx/Tx" : | 4306 | (ctrl & E1000_CTRL_TFCE) && (ctrl & E1000_CTRL_RFCE) ? "Rx/Tx" : |
4308 | (ctrl & E1000_CTRL_RFCE) ? "Rx" : | 4307 | (ctrl & E1000_CTRL_RFCE) ? "Rx" : |
@@ -4521,8 +4520,7 @@ static void e1000_watchdog_task(struct work_struct *work) | |||
4521 | adapter->link_speed = 0; | 4520 | adapter->link_speed = 0; |
4522 | adapter->link_duplex = 0; | 4521 | adapter->link_duplex = 0; |
4523 | /* Link status message must follow this format */ | 4522 | /* Link status message must follow this format */ |
4524 | printk(KERN_INFO "e1000e: %s NIC Link is Down\n", | 4523 | pr_info("%s NIC Link is Down\n", adapter->netdev->name); |
4525 | adapter->netdev->name); | ||
4526 | netif_carrier_off(netdev); | 4524 | netif_carrier_off(netdev); |
4527 | if (!test_bit(__E1000_DOWN, &adapter->state)) | 4525 | if (!test_bit(__E1000_DOWN, &adapter->state)) |
4528 | mod_timer(&adapter->phy_info_timer, | 4526 | mod_timer(&adapter->phy_info_timer, |