chelsio: Use netdev_<level> and pr_<level>

[karo-tx-linux.git] / drivers / net / ethernet / chelsio / cxgb4vf / cxgb4vf_main.c

diff --git a/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c b/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c
index 0188df705719d8d601c6d4dd4685f1f762c023f6..56b46ab2d4c5ae452410da4469ab7b2c86ba1894 100644 (file)
--- a/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c
+++ b/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c
@@ -33,6 +33,8 @@
  * SOFTWARE.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/init.h>
@@ -196,11 +198,10 @@ void t4vf_os_link_changed(struct adapter *adapter, int pidx, int link_ok)
                        break;
                }
 
-               printk(KERN_INFO "%s: link up, %s, full-duplex, %s PAUSE\n",
-                      dev->name, s, fc);
+               netdev_info(dev, "link up, %s, full-duplex, %s PAUSE\n", s, fc);
        } else {
                netif_carrier_off(dev);
-               printk(KERN_INFO "%s: link down\n", dev->name);
+               netdev_info(dev, "link down\n");
        }
 }
 
@@ -2465,8 +2466,6 @@ static const struct net_device_ops cxgb4vf_netdev_ops     = {
 static int cxgb4vf_pci_probe(struct pci_dev *pdev,
                             const struct pci_device_id *ent)
 {
-       static int version_printed;
-
        int pci_using_dac;
        int err, pidx;
        unsigned int pmask;
@@ -2478,10 +2477,7 @@ static int cxgb4vf_pci_probe(struct pci_dev *pdev,
         * Print our driver banner the first time we're called to initialize a
         * device.
         */
-       if (version_printed == 0) {
-               printk(KERN_INFO "%s - version %s\n", DRV_DESC, DRV_VERSION);
-               version_printed = 1;
-       }
+       pr_info_once("%s - version %s\n", DRV_DESC, DRV_VERSION);
 
        /*
         * Initialize generic PCI device state.
@@ -2920,18 +2916,15 @@ static int __init cxgb4vf_module_init(void)
         * Vet our module parameters.
         */
        if (msi != MSI_MSIX && msi != MSI_MSI) {
-               printk(KERN_WARNING KBUILD_MODNAME
-                      ": bad module parameter msi=%d; must be %d"
-                      " (MSI-X or MSI) or %d (MSI)\n",
-                      msi, MSI_MSIX, MSI_MSI);
+               pr_warn("bad module parameter msi=%d; must be %d (MSI-X or MSI) or %d (MSI)\n",
+                       msi, MSI_MSIX, MSI_MSI);
                return -EINVAL;
        }
 
        /* Debugfs support is optional, just warn if this fails */
        cxgb4vf_debugfs_root = debugfs_create_dir(KBUILD_MODNAME, NULL);
        if (IS_ERR_OR_NULL(cxgb4vf_debugfs_root))
-               printk(KERN_WARNING KBUILD_MODNAME ": could not create"
-                      " debugfs entry, continuing\n");
+               pr_warn("could not create debugfs entry, continuing\n");
 
        ret = pci_register_driver(&cxgb4vf_driver);
        if (ret < 0 && !IS_ERR_OR_NULL(cxgb4vf_debugfs_root))