[dpdk-dev] [PATCH 1/5] igb_uio: use kernel standard log message

[Stephen Hemminger]

Use pr_info() and dev_info() to print out log messages where appropriate.

Signed-off-by: Stephen Hemminger <shemming at brocade.com>


--- a/lib/librte_eal/linuxapp/igb_uio/igb_uio.c 2014-05-14 09:01:21.149196906 
-0700
+++ b/lib/librte_eal/linuxapp/igb_uio/igb_uio.c 2014-05-14 09:01:21.149196906 
-0700
@@ -22,6 +22,8 @@
  *   Intel Corporation
  */

+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/device.h>
 #include <linux/module.h>
 #include <linux/pci.h>
@@ -316,7 +318,7 @@ done:
        pci_unlock(pdev);
 spin_unlock:
        spin_unlock_irqrestore(&udev->lock, flags);
-       printk(KERN_INFO "irq 0x%x %s\n", irq, (ret == IRQ_HANDLED) ? "handled" 
: "not handled");
+       pr_info("irq 0x%x %s\n", irq, (ret == IRQ_HANDLED) ? "handled" : "not 
handled");

        return ret;
 }
@@ -479,7 +481,7 @@ igbuio_pci_probe(struct pci_dev *dev, co
         * memory
         */
        if (pci_enable_device(dev)) {
-               printk(KERN_ERR "Cannot enable PCI device\n");
+               dev_err(&dev->dev, "Cannot enable PCI device\n");
                goto fail_free;
        }

@@ -488,7 +490,7 @@ igbuio_pci_probe(struct pci_dev *dev, co
         * module
         */
        if (pci_request_regions(dev, "igb_uio")) {
-               printk(KERN_ERR "Cannot request regions\n");
+               dev_err(&dev->dev, "Cannot request regions\n");
                goto fail_disable;
        }

@@ -501,10 +503,10 @@ igbuio_pci_probe(struct pci_dev *dev, co

        /* set 64-bit DMA mask */
        if (pci_set_dma_mask(dev,  DMA_BIT_MASK(64))) {
-               printk(KERN_ERR "Cannot set DMA mask\n");
+               dev_err(&dev->dev, "Cannot set DMA mask\n");
                goto fail_release_iomem;
        } else if (pci_set_consistent_dma_mask(dev, DMA_BIT_MASK(64))) {
-               printk(KERN_ERR "Cannot set consistent DMA mask\n");
+               dev_err(&dev->dev, "Cannot set consistent DMA mask\n");
                goto fail_release_iomem;
        }

@@ -535,7 +537,7 @@ igbuio_pci_probe(struct pci_dev *dev, co
                }
                else {
                        pci_disable_msix(udev->pdev);
-                       printk(KERN_INFO "fail to enable pci msix, or not 
enough msix entries\n");
+                       pr_info("fail to enable pci msix, or not enough msix 
entries\n");
                }
        }
        switch (udev->mode) {
@@ -563,7 +565,8 @@ igbuio_pci_probe(struct pci_dev *dev, co
        if (uio_register_device(&dev->dev, &udev->info))
                goto fail_release_iomem;

-       printk(KERN_INFO "uio device registered with irq %lx\n", 
udev->info.irq);
+       dev_info(&dev->dev, "uio device registered with irq %lx\n",
+                udev->info.irq);

        return 0;

@@ -587,7 +590,7 @@ igbuio_pci_remove(struct pci_dev *dev)
        struct uio_info *info = pci_get_drvdata(dev);

        if (info->priv == NULL) {
-               printk(KERN_DEBUG "Not igbuio device\n");
+               pr_notice("Not igbuio device\n");
                return;
        }

@@ -607,18 +610,18 @@ static int
 igbuio_config_intr_mode(char *intr_str)
 {
        if (!intr_str) {
-               printk(KERN_INFO "Use MSIX interrupt by default\n");
+               pr_info("Use MSIX interrupt by default\n");
                return 0;
        }

        if (!strcmp(intr_str, "msix")) {
                igbuio_intr_mode_preferred = IGBUIO_MSIX_INTR_MODE;
-               printk(KERN_INFO "Use MSIX interrupt\n");
+               pr_info("Use MSIX interrupt\n");
        } else if (!strcmp(intr_str, "legacy")) {
                igbuio_intr_mode_preferred = IGBUIO_LEGACY_INTR_MODE;
-               printk(KERN_INFO "Use legacy interrupt\n");
+               pr_info("Use legacy interrupt\n");
        } else {
-               printk(KERN_INFO "Error: bad parameter - %s\n", intr_str);
+               pr_info("Error: bad parameter - %s\n", intr_str);
                return -EINVAL;
        }