提交 7dbc1672 编写于 作者: B Bruce Allan 提交者: Jeff Kirsher

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: NBruce Allan <bruce.w.allan@intel.com>
Tested-by: NAaron Brown <aaron.f.brown@intel.com>
Signed-off-by: NJeff Kirsher <jeffrey.t.kirsher@intel.com>
上级 8e5ab42d
...@@ -4300,9 +4300,8 @@ static void e1000_print_link_info(struct e1000_adapter *adapter) ...@@ -4300,9 +4300,8 @@ static void e1000_print_link_info(struct e1000_adapter *adapter)
u32 ctrl = er32(CTRL); u32 ctrl = er32(CTRL);
/* Link status message must follow this format for user tools */ /* Link status message must follow this format for user tools */
printk(KERN_INFO "e1000e: %s NIC Link is Up %d Mbps %s Duplex, Flow Control: %s\n", pr_info("%s NIC Link is Up %d Mbps %s Duplex, Flow Control: %s\n",
adapter->netdev->name, adapter->netdev->name, adapter->link_speed,
adapter->link_speed,
adapter->link_duplex == FULL_DUPLEX ? "Full" : "Half", adapter->link_duplex == FULL_DUPLEX ? "Full" : "Half",
(ctrl & E1000_CTRL_TFCE) && (ctrl & E1000_CTRL_RFCE) ? "Rx/Tx" : (ctrl & E1000_CTRL_TFCE) && (ctrl & E1000_CTRL_RFCE) ? "Rx/Tx" :
(ctrl & E1000_CTRL_RFCE) ? "Rx" : (ctrl & E1000_CTRL_RFCE) ? "Rx" :
...@@ -4521,8 +4520,7 @@ static void e1000_watchdog_task(struct work_struct *work) ...@@ -4521,8 +4520,7 @@ static void e1000_watchdog_task(struct work_struct *work)
adapter->link_speed = 0; adapter->link_speed = 0;
adapter->link_duplex = 0; adapter->link_duplex = 0;
/* Link status message must follow this format */ /* Link status message must follow this format */
printk(KERN_INFO "e1000e: %s NIC Link is Down\n", pr_info("%s NIC Link is Down\n", adapter->netdev->name);
adapter->netdev->name);
netif_carrier_off(netdev); netif_carrier_off(netdev);
if (!test_bit(__E1000_DOWN, &adapter->state)) if (!test_bit(__E1000_DOWN, &adapter->state))
mod_timer(&adapter->phy_info_timer, mod_timer(&adapter->phy_info_timer,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册