From a4ba8cbeeb07f7bc8f9bcbd3f9962adb50376034 Mon Sep 17 00:00:00 2001 From: Jeff Kirsher Date: Fri, 21 Oct 2011 19:42:26 +0000 Subject: [PATCH] igbvf: Convert printks to pr_ Based on the previous patch from Joe Perches Use current logging styles. Prefix all output via #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt Neaten link status dev_info. -v2 Remove Copyright changes and fix-up patch to make it checkpatch.pl compliant. CC: Joe Perches Signed-off-by: Jeff Kirsher Tested-by: Sibai Li --- drivers/net/ethernet/intel/igbvf/netdev.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/net/ethernet/intel/igbvf/netdev.c b/drivers/net/ethernet/intel/igbvf/netdev.c index cca78124be31..d076a8da50a4 100644 --- a/drivers/net/ethernet/intel/igbvf/netdev.c +++ b/drivers/net/ethernet/intel/igbvf/netdev.c @@ -25,6 +25,8 @@ *******************************************************************************/ +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + #include #include #include @@ -1746,10 +1748,9 @@ void igbvf_update_stats(struct igbvf_adapter *adapter) static void igbvf_print_link_info(struct igbvf_adapter *adapter) { - dev_info(&adapter->pdev->dev, "Link is Up %d Mbps %s\n", - adapter->link_speed, - ((adapter->link_duplex == FULL_DUPLEX) ? - "Full Duplex" : "Half Duplex")); + dev_info(&adapter->pdev->dev, "Link is Up %d Mbps %s Duplex\n", + adapter->link_speed, + adapter->link_duplex == FULL_DUPLEX ? "Full" : "Half"); } static bool igbvf_has_link(struct igbvf_adapter *adapter) @@ -2842,9 +2843,8 @@ static struct pci_driver igbvf_driver = { static int __init igbvf_init_module(void) { int ret; - printk(KERN_INFO "%s - version %s\n", - igbvf_driver_string, igbvf_driver_version); - printk(KERN_INFO "%s\n", igbvf_copyright); + pr_info("%s - version %s\n", igbvf_driver_string, igbvf_driver_version); + pr_info("%s\n", igbvf_copyright); ret = pci_register_driver(&igbvf_driver); -- 2.11.0