Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7dbc1672 authored by Bruce Allan's avatar Bruce Allan Committed by Jeff Kirsher
Browse files

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: default avatarBruce Allan <bruce.w.allan@intel.com>
Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 8e5ab42d

drivers/net/ethernet/intel/e1000e/netdev.c

+3 −5
Original line number Diff line number Diff line
@@ -4300,9 +4300,8 @@ static void e1000_print_link_info(struct e1000_adapter *adapter) 
	u32 ctrl = er32(CTRL);



	/* 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",

		adapter->netdev->name,

		adapter->link_speed,

	pr_info("%s NIC Link is Up %d Mbps %s Duplex, Flow Control: %s\n",

		adapter->netdev->name, adapter->link_speed,

		adapter->link_duplex == FULL_DUPLEX ? "Full" : "Half",

		(ctrl & E1000_CTRL_TFCE) && (ctrl & E1000_CTRL_RFCE) ? "Rx/Tx" :

		(ctrl & E1000_CTRL_RFCE) ? "Rx" :
@@ -4521,8 +4520,7 @@ static void e1000_watchdog_task(struct work_struct *work) 
			adapter->link_speed = 0;

			adapter->link_duplex = 0;

			/* Link status message must follow this format */

			printk(KERN_INFO "e1000e: %s NIC Link is Down\n",

			       adapter->netdev->name);

			pr_info("%s NIC Link is Down\n", adapter->netdev->name);

			netif_carrier_off(netdev);

			if (!test_bit(__E1000_DOWN, &adapter->state))

				mod_timer(&adapter->phy_info_timer,