From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <stephen@networkplumber.org>
Received: from mail-pd0-f180.google.com (mail-pd0-f180.google.com
[209.85.192.180]) by dpdk.org (Postfix) with ESMTP id 1322F590F
for <dev@dpdk.org>; Fri, 18 Jul 2014 18:14:09 +0200 (CEST)
Received: by mail-pd0-f180.google.com with SMTP id y13so5304510pdi.39
for <dev@dpdk.org>; Fri, 18 Jul 2014 09:15:10 -0700 (PDT)
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20130820;
h=x-gm-message-state:message-id:user-agent:date:from:to:cc:subject
:references:mime-version:content-type:content-disposition;
bh=8yA9Xmi972mBTzvL9KMFWawE7wNHg+xN63We9F46Uos=;
b=iJ6EOXMfHeVMVQCG9HkMpLoo3WwXBKP5/wD4t7oPLV2VrsKC3htClgLrSCgA0VmUjs
lu5ivkO+6ufrx0i0FyMoIz0LZzHIuLsSUQuHLbodXvw0JFGlPvW6hnFWdPIzPiw0s8Bx
rCw37uppip091m7aPoOaEbraFTACWh3f6cCK28YJXYvKp/SyK8x9r79vyfE4okyPEQzG
W8WLBorWZbWeBjpjZqsi+T+sWTawVBeGxs+W/kAaXJ8vSzitBbltOlIGDrvvCe/Veq4W
NjDlqj6R9brjiV0CmulYjMDBDRnt9FYmx3v43+9ZwTUHGoIeZaMJ2XG/ImgBbTy+H9hR
R0XQ==
X-Gm-Message-State: ALoCoQnHjsXELZTvHNRW56IIO0RyXDdIXEAc0utNv2/NTN5sA09tMa6jRz6wJExdMFZDHYNKKmTW
X-Received: by 10.68.139.36 with SMTP id qv4mr6573904pbb.82.1405700110617;
Fri, 18 Jul 2014 09:15:10 -0700 (PDT)
Received: from localhost (static-50-53-66-61.bvtn.or.frontiernet.net.
[50.53.66.61])
by mx.google.com with ESMTPSA id qn13sm7989116pdb.69.2014.07.18.09.15.09
for <multiple recipients>
(version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
Fri, 18 Jul 2014 09:15:09 -0700 (PDT)
Message-Id: <20140718161512.198984696@networkplumber.org>
User-Agent: quilt/0.63-1
Date: Fri, 18 Jul 2014 09:14:48 -0700
From: Stephen Hemminger <stephen@networkplumber.org>
To: Thomas Monjalon <thomas.monjalon@6wind.com>
References: <20140718161447.020882834@networkplumber.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-15
Content-Disposition: inline; filename=igb_uio-msg.patch
Cc: dev@dpdk.org
Subject: [dpdk-dev] [PATCH 01/10] igb_uio: use kernel standard log message
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: patches and discussions about DPDK <dev.dpdk.org>
List-Unsubscribe: <http://dpdk.org/ml/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://dpdk.org/ml/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <http://dpdk.org/ml/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
X-List-Received-Date: Fri, 18 Jul 2014 16:14:10 -0000
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>
--- a/lib/librte_eal/linuxapp/igb_uio/igb_uio.c 2014-06-19 14:29:03.435405487 -0700
+++ b/lib/librte_eal/linuxapp/igb_uio/igb_uio.c 2014-06-19 14:59:18.000000000 -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>
@@ -394,7 +396,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;
}
@@ -557,7 +559,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;
}
@@ -566,7 +568,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;
}
@@ -579,10 +581,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;
}
@@ -613,7 +615,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) {
@@ -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;
}