ixgbevf: Convert printks to pr_<level>
Based on the original patch from Joe Perches <joe@perches.com> Use the current logging styles, prefix output with "ixgbevf: " Add #define pr_fmt Coalesce formats. -v2 Fix-up to make checkpatch.pl compliant and remove change to copyright line CC: Joe Perches <joe@perches.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Tested-by: Sibai Li <sibai.li@intel.com>
This commit is contained in:
parent
a4ba8cbeeb
commit
dbd9636e28
|
@ -27,6 +27,8 @@
|
||||||
|
|
||||||
/* ethtool support for ixgbevf */
|
/* ethtool support for ixgbevf */
|
||||||
|
|
||||||
|
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
||||||
|
|
||||||
#include <linux/types.h>
|
#include <linux/types.h>
|
||||||
#include <linux/module.h>
|
#include <linux/module.h>
|
||||||
#include <linux/slab.h>
|
#include <linux/slab.h>
|
||||||
|
@ -549,8 +551,8 @@ static const u32 register_test_patterns[] = {
|
||||||
writel((W & M), (adapter->hw.hw_addr + R)); \
|
writel((W & M), (adapter->hw.hw_addr + R)); \
|
||||||
val = readl(adapter->hw.hw_addr + R); \
|
val = readl(adapter->hw.hw_addr + R); \
|
||||||
if ((W & M) != (val & M)) { \
|
if ((W & M) != (val & M)) { \
|
||||||
printk(KERN_ERR "set/check reg %04X test failed: got 0x%08X " \
|
pr_err("set/check reg %04X test failed: got 0x%08X expected " \
|
||||||
"expected 0x%08X\n", R, (val & M), (W & M)); \
|
"0x%08X\n", R, (val & M), (W & M)); \
|
||||||
*data = R; \
|
*data = R; \
|
||||||
writel(before, (adapter->hw.hw_addr + R)); \
|
writel(before, (adapter->hw.hw_addr + R)); \
|
||||||
return 1; \
|
return 1; \
|
||||||
|
|
|
@ -29,6 +29,9 @@
|
||||||
/******************************************************************************
|
/******************************************************************************
|
||||||
Copyright (c)2006 - 2007 Myricom, Inc. for some LRO specific code
|
Copyright (c)2006 - 2007 Myricom, Inc. for some LRO specific code
|
||||||
******************************************************************************/
|
******************************************************************************/
|
||||||
|
|
||||||
|
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
||||||
|
|
||||||
#include <linux/types.h>
|
#include <linux/types.h>
|
||||||
#include <linux/bitops.h>
|
#include <linux/bitops.h>
|
||||||
#include <linux/module.h>
|
#include <linux/module.h>
|
||||||
|
@ -1437,7 +1440,7 @@ static int ixgbevf_write_uc_addr_list(struct net_device *netdev)
|
||||||
int count = 0;
|
int count = 0;
|
||||||
|
|
||||||
if ((netdev_uc_count(netdev)) > 10) {
|
if ((netdev_uc_count(netdev)) > 10) {
|
||||||
printk(KERN_ERR "Too many unicast filters - No Space\n");
|
pr_err("Too many unicast filters - No Space\n");
|
||||||
return -ENOSPC;
|
return -ENOSPC;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2135,7 +2138,7 @@ static int ixgbevf_init_interrupt_scheme(struct ixgbevf_adapter *adapter)
|
||||||
|
|
||||||
err = ixgbevf_alloc_queues(adapter);
|
err = ixgbevf_alloc_queues(adapter);
|
||||||
if (err) {
|
if (err) {
|
||||||
printk(KERN_ERR "Unable to allocate memory for queues\n");
|
pr_err("Unable to allocate memory for queues\n");
|
||||||
goto err_alloc_queues;
|
goto err_alloc_queues;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2189,7 +2192,7 @@ static int __devinit ixgbevf_sw_init(struct ixgbevf_adapter *adapter)
|
||||||
} else {
|
} else {
|
||||||
err = hw->mac.ops.init_hw(hw);
|
err = hw->mac.ops.init_hw(hw);
|
||||||
if (err) {
|
if (err) {
|
||||||
printk(KERN_ERR "init_shared_code failed: %d\n", err);
|
pr_err("init_shared_code failed: %d\n", err);
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -2630,8 +2633,8 @@ static int ixgbevf_open(struct net_device *netdev)
|
||||||
* the vf can't start. */
|
* the vf can't start. */
|
||||||
if (hw->adapter_stopped) {
|
if (hw->adapter_stopped) {
|
||||||
err = IXGBE_ERR_MBX;
|
err = IXGBE_ERR_MBX;
|
||||||
printk(KERN_ERR "Unable to start - perhaps the PF"
|
pr_err("Unable to start - perhaps the PF Driver isn't "
|
||||||
" Driver isn't up yet\n");
|
"up yet\n");
|
||||||
goto err_setup_reset;
|
goto err_setup_reset;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -2842,10 +2845,8 @@ static bool ixgbevf_tx_csum(struct ixgbevf_adapter *adapter,
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
if (unlikely(net_ratelimit())) {
|
if (unlikely(net_ratelimit())) {
|
||||||
printk(KERN_WARNING
|
pr_warn("partial checksum but "
|
||||||
"partial checksum but "
|
"proto=%x!\n", skb->protocol);
|
||||||
"proto=%x!\n",
|
|
||||||
skb->protocol);
|
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -3414,7 +3415,7 @@ static int __devinit ixgbevf_probe(struct pci_dev *pdev,
|
||||||
memcpy(netdev->perm_addr, adapter->hw.mac.addr, netdev->addr_len);
|
memcpy(netdev->perm_addr, adapter->hw.mac.addr, netdev->addr_len);
|
||||||
|
|
||||||
if (!is_valid_ether_addr(netdev->dev_addr)) {
|
if (!is_valid_ether_addr(netdev->dev_addr)) {
|
||||||
printk(KERN_ERR "invalid MAC address\n");
|
pr_err("invalid MAC address\n");
|
||||||
err = -EIO;
|
err = -EIO;
|
||||||
goto err_sw_init;
|
goto err_sw_init;
|
||||||
}
|
}
|
||||||
|
@ -3535,10 +3536,10 @@ static struct pci_driver ixgbevf_driver = {
|
||||||
static int __init ixgbevf_init_module(void)
|
static int __init ixgbevf_init_module(void)
|
||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
printk(KERN_INFO "ixgbevf: %s - version %s\n", ixgbevf_driver_string,
|
pr_info("%s - version %s\n", ixgbevf_driver_string,
|
||||||
ixgbevf_driver_version);
|
ixgbevf_driver_version);
|
||||||
|
|
||||||
printk(KERN_INFO "%s\n", ixgbevf_copyright);
|
pr_info("%s\n", ixgbevf_copyright);
|
||||||
|
|
||||||
ret = pci_register_driver(&ixgbevf_driver);
|
ret = pci_register_driver(&ixgbevf_driver);
|
||||||
return ret;
|
return ret;
|
||||||
|
|
Loading…
Reference in a new issue