d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

igb_uio: use kernel standard log message

Browse Source 
Use Linux kernel standard coding conventions for console messages.
Bare use of printk() is not desirable and is reported as a style
problem by checkpatch. Instead use pr_info() and dev_info()
to print out log messages where appropriate.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Acked-by: Thomas Monjalon <thomas.monjalon@6wind.com>
This commit is contained in:
Stephen Hemminger 2014-06-06 16:50:29 -07:00 committed by Thomas Monjalon
parent 9916d3d12f
commit 4ca2826506
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lib/librte_eal/linuxapp/igb_uio/igb_uio.c
View File

@ -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>
@ -394,7 +396,7 @@ igbuio_pci_irqhandler(int irq, struct uio_info *info)
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;
}
@ -557,7 +559,7 @@ igbuio_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
* 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;
}
@ -566,7 +568,7 @@ igbuio_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
* 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;
}
@ -579,10 +581,10 @@ igbuio_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
/* 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;
}
@ -613,7 +615,7 @@ igbuio_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
}
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) {
@ -641,7 +643,7 @@ igbuio_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
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);
pr_info("uio device registered with irq %lx\n", udev->info.irq);
return 0;
@ -665,7 +667,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;
}
@ -685,18 +687,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, RTE_INTR_MODE_MSIX_NAME)) {
igbuio_intr_mode_preferred = RTE_INTR_MODE_MSIX;
printk(KERN_INFO "Use MSIX interrupt\n");
pr_info("Use MSIX interrupt\n");
} else if (!strcmp(intr_str, RTE_INTR_MODE_LEGACY_NAME)) {
igbuio_intr_mode_preferred = RTE_INTR_MODE_LEGACY;
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;
}