diff options
author | Joe Perches <joe@perches.com> | 2013-06-28 06:21:41 -0400 |
---|---|---|
committer | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2013-06-28 11:19:58 -0400 |
commit | 283c0972d53769ee44750cad4c27e3f5fa26ec1f (patch) | |
tree | 598a36146515f114e21047daa9e19ea8ac8e5fdc /drivers/xen/pcpu.c | |
parent | 65e053a7038c608f89272d4fb1f899890c579f0a (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/pcpu.c')
-rw-r--r-- | drivers/xen/pcpu.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/xen/pcpu.c b/drivers/xen/pcpu.c index 6536d5ab1697..79e1dff7ed4f 100644 --- a/drivers/xen/pcpu.c +++ b/drivers/xen/pcpu.c | |||
@@ -31,6 +31,8 @@ | |||
31 | * IN THE SOFTWARE. | 31 | * IN THE SOFTWARE. |
32 | */ | 32 | */ |
33 | 33 | ||
34 | #define pr_fmt(fmt) "xen_cpu: " fmt | ||
35 | |||
34 | #include <linux/interrupt.h> | 36 | #include <linux/interrupt.h> |
35 | #include <linux/spinlock.h> | 37 | #include <linux/spinlock.h> |
36 | #include <linux/cpu.h> | 38 | #include <linux/cpu.h> |
@@ -44,7 +46,6 @@ | |||
44 | #include <asm/xen/hypervisor.h> | 46 | #include <asm/xen/hypervisor.h> |
45 | #include <asm/xen/hypercall.h> | 47 | #include <asm/xen/hypercall.h> |
46 | 48 | ||
47 | #define XEN_PCPU "xen_cpu: " | ||
48 | 49 | ||
49 | /* | 50 | /* |
50 | * @cpu_id: Xen physical cpu logic number | 51 | * @cpu_id: Xen physical cpu logic number |
@@ -242,8 +243,7 @@ static struct pcpu *create_and_register_pcpu(struct xenpf_pcpuinfo *info) | |||
242 | 243 | ||
243 | err = register_pcpu(pcpu); | 244 | err = register_pcpu(pcpu); |
244 | if (err) { | 245 | if (err) { |
245 | pr_warning(XEN_PCPU "Failed to register pcpu%u\n", | 246 | pr_warn("Failed to register pcpu%u\n", info->xen_cpuid); |
246 | info->xen_cpuid); | ||
247 | return ERR_PTR(-ENOENT); | 247 | return ERR_PTR(-ENOENT); |
248 | } | 248 | } |
249 | 249 | ||
@@ -378,19 +378,19 @@ static int __init xen_pcpu_init(void) | |||
378 | xen_pcpu_interrupt, 0, | 378 | xen_pcpu_interrupt, 0, |
379 | "xen-pcpu", NULL); | 379 | "xen-pcpu", NULL); |
380 | if (irq < 0) { | 380 | if (irq < 0) { |
381 | pr_warning(XEN_PCPU "Failed to bind pcpu virq\n"); | 381 | pr_warn("Failed to bind pcpu virq\n"); |
382 | return irq; | 382 | return irq; |
383 | } | 383 | } |
384 | 384 | ||
385 | ret = subsys_system_register(&xen_pcpu_subsys, NULL); | 385 | ret = subsys_system_register(&xen_pcpu_subsys, NULL); |
386 | if (ret) { | 386 | if (ret) { |
387 | pr_warning(XEN_PCPU "Failed to register pcpu subsys\n"); | 387 | pr_warn("Failed to register pcpu subsys\n"); |
388 | goto err1; | 388 | goto err1; |
389 | } | 389 | } |
390 | 390 | ||
391 | ret = xen_sync_pcpus(); | 391 | ret = xen_sync_pcpus(); |
392 | if (ret) { | 392 | if (ret) { |
393 | pr_warning(XEN_PCPU "Failed to sync pcpu info\n"); | 393 | pr_warn("Failed to sync pcpu info\n"); |
394 | goto err2; | 394 | goto err2; |
395 | } | 395 | } |
396 | 396 | ||