From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pa0-f43.google.com (mail-pa0-f43.google.com [209.85.220.43]) by dpdk.org (Postfix) with ESMTP id F111DB0B6 for ; Wed, 14 May 2014 18:34:58 +0200 (CEST) Received: by mail-pa0-f43.google.com with SMTP id hz1so1888984pad.30 for ; Wed, 14 May 2014 09:35:06 -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=BrGDgY98ga+87xlOwWn0A8w1Q81cwQzeXovftXzX8+A=; b=AETXdDWju1WZVad5K5yRvnjjNwPtuJJk/madZDv3aSIg4RmJGnl8Z6ZMxjCOnM9Svf BbRZHzrYL2Oq+eYgERT44O3HgPI93AhiJjbMqfojXFecYpjiRLNJIyL7IWl2eisHQg3S DYqj0V763bHBcisaDz5DpxAwIfe+H6IPV7nVTk1igPjB68+111uyZrsSasqmr4D9x2ru EBkBklQWNOtr6q6WLrihtdf6rE8g0fr7PEgyb1gwLlvi16H/fgEzxDJ2MgvPhmHUkfp1 F8YZFlYRlxUQbXazy9tO9ON8T5RwiZQHXwNIAGLjVJn0PT60eD3mLNipgu56mOySXJLP BmSg== X-Gm-Message-State: ALoCoQk2IEMX0VA+LfgRIvIje52p4rayJfXlnwAqTCpEjFxdUZnweIBEUgjCk4CJ2rqsZih1+Gxy X-Received: by 10.66.241.66 with SMTP id wg2mr5691641pac.132.1400085306227; Wed, 14 May 2014 09:35:06 -0700 (PDT) Received: from localhost (static-50-53-83-51.bvtn.or.frontiernet.net. [50.53.83.51]) by mx.google.com with ESMTPSA id jq6sm4343319pbb.76.2014.05.14.09.35.05 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 May 2014 09:35:05 -0700 (PDT) Message-Id: <20140514163504.660239977@networkplumber.org> User-Agent: quilt/0.61-1 Date: Wed, 14 May 2014 09:34:02 -0700 From: Stephen Hemminger To: dev@dpdk.org References: <20140514163401.079384157@networkplumber.org> MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Content-Disposition: inline; filename=igb_uio-msg.patch Cc: Stephen Hemminger Subject: [dpdk-dev] [PATCH 1/5] 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 May 2014 16:34:59 -0000 Use pr_info() and dev_info() to print out log messages where appropriate. Signed-off-by: Stephen Hemminger --- 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 #include #include @@ -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; }