aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/xen/xen-pciback/pciback_ops.c
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2013-06-28 06:21:41 -0400
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>2013-06-28 11:19:58 -0400
commit283c0972d53769ee44750cad4c27e3f5fa26ec1f (patch)
tree598a36146515f114e21047daa9e19ea8ac8e5fdc /drivers/xen/xen-pciback/pciback_ops.c
parent65e053a7038c608f89272d4fb1f899890c579f0a (diff)
xen: Convert printks to pr_<level>
Convert printks to pr_<level> (excludes printk(KERN_DEBUG...) to be more consistent throughout the xen subsystem. Add pr_fmt with KBUILD_MODNAME or "xen:" KBUILD_MODNAME Coalesce formats and add missing word spaces Add missing newlines Align arguments and reflow to 80 columns Remove DRV_NAME from formats as pr_fmt adds the same content This does change some of the prefixes of these messages but it also does make them more consistent. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Diffstat (limited to 'drivers/xen/xen-pciback/pciback_ops.c')
-rw-r--r--drivers/xen/xen-pciback/pciback_ops.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/xen/xen-pciback/pciback_ops.c b/drivers/xen/xen-pciback/pciback_ops.c
index b98cf0c35725..64eb0cd8b8af 100644
--- a/drivers/xen/xen-pciback/pciback_ops.c
+++ b/drivers/xen/xen-pciback/pciback_ops.c
@@ -3,6 +3,9 @@
3 * 3 *
4 * Author: Ryan Wilson <hap9@epoch.ncsc.mil> 4 * Author: Ryan Wilson <hap9@epoch.ncsc.mil>
5 */ 5 */
6
7#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
8
6#include <linux/module.h> 9#include <linux/module.h>
7#include <linux/wait.h> 10#include <linux/wait.h>
8#include <linux/bitops.h> 11#include <linux/bitops.h>
@@ -144,7 +147,7 @@ int xen_pcibk_enable_msi(struct xen_pcibk_device *pdev,
144 status = pci_enable_msi(dev); 147 status = pci_enable_msi(dev);
145 148
146 if (status) { 149 if (status) {
147 pr_warn_ratelimited(DRV_NAME ": %s: error enabling MSI for guest %u: err %d\n", 150 pr_warn_ratelimited("%s: error enabling MSI for guest %u: err %d\n",
148 pci_name(dev), pdev->xdev->otherend_id, 151 pci_name(dev), pdev->xdev->otherend_id,
149 status); 152 status);
150 op->value = 0; 153 op->value = 0;
@@ -225,7 +228,7 @@ int xen_pcibk_enable_msix(struct xen_pcibk_device *pdev,
225 op->msix_entries[i].vector); 228 op->msix_entries[i].vector);
226 } 229 }
227 } else 230 } else
228 pr_warn_ratelimited(DRV_NAME ": %s: error enabling MSI-X for guest %u: err %d!\n", 231 pr_warn_ratelimited("%s: error enabling MSI-X for guest %u: err %d!\n",
229 pci_name(dev), pdev->xdev->otherend_id, 232 pci_name(dev), pdev->xdev->otherend_id,
230 result); 233 result);
231 kfree(entries); 234 kfree(entries);
@@ -372,7 +375,7 @@ static irqreturn_t xen_pcibk_guest_interrupt(int irq, void *dev_id)
372 dev_data->handled++; 375 dev_data->handled++;
373 if ((dev_data->handled % 1000) == 0) { 376 if ((dev_data->handled % 1000) == 0) {
374 if (xen_test_irq_shared(irq)) { 377 if (xen_test_irq_shared(irq)) {
375 printk(KERN_INFO "%s IRQ line is not shared " 378 pr_info("%s IRQ line is not shared "
376 "with other domains. Turning ISR off\n", 379 "with other domains. Turning ISR off\n",
377 dev_data->irq_name); 380 dev_data->irq_name);
378 dev_data->ack_intr = 0; 381 dev_data->ack_intr = 0;