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/gntdev.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/gntdev.c')
-rw-r--r-- | drivers/xen/gntdev.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/xen/gntdev.c b/drivers/xen/gntdev.c index 3c8803feba26..eab5427c75f5 100644 --- a/drivers/xen/gntdev.c +++ b/drivers/xen/gntdev.c | |||
@@ -19,6 +19,8 @@ | |||
19 | 19 | ||
20 | #undef DEBUG | 20 | #undef DEBUG |
21 | 21 | ||
22 | #define pr_fmt(fmt) "xen:" KBUILD_MODNAME ": " fmt | ||
23 | |||
22 | #include <linux/module.h> | 24 | #include <linux/module.h> |
23 | #include <linux/kernel.h> | 25 | #include <linux/kernel.h> |
24 | #include <linux/init.h> | 26 | #include <linux/init.h> |
@@ -760,7 +762,7 @@ static int gntdev_mmap(struct file *flip, struct vm_area_struct *vma) | |||
760 | if (use_ptemod && map->vma) | 762 | if (use_ptemod && map->vma) |
761 | goto unlock_out; | 763 | goto unlock_out; |
762 | if (use_ptemod && priv->mm != vma->vm_mm) { | 764 | if (use_ptemod && priv->mm != vma->vm_mm) { |
763 | printk(KERN_WARNING "Huh? Other mm?\n"); | 765 | pr_warn("Huh? Other mm?\n"); |
764 | goto unlock_out; | 766 | goto unlock_out; |
765 | } | 767 | } |
766 | 768 | ||
@@ -795,7 +797,7 @@ static int gntdev_mmap(struct file *flip, struct vm_area_struct *vma) | |||
795 | vma->vm_end - vma->vm_start, | 797 | vma->vm_end - vma->vm_start, |
796 | find_grant_ptes, map); | 798 | find_grant_ptes, map); |
797 | if (err) { | 799 | if (err) { |
798 | printk(KERN_WARNING "find_grant_ptes() failure.\n"); | 800 | pr_warn("find_grant_ptes() failure.\n"); |
799 | goto out_put_map; | 801 | goto out_put_map; |
800 | } | 802 | } |
801 | } | 803 | } |
@@ -855,7 +857,7 @@ static int __init gntdev_init(void) | |||
855 | 857 | ||
856 | err = misc_register(&gntdev_miscdev); | 858 | err = misc_register(&gntdev_miscdev); |
857 | if (err != 0) { | 859 | if (err != 0) { |
858 | printk(KERN_ERR "Could not register gntdev device\n"); | 860 | pr_err("Could not register gntdev device\n"); |
859 | return err; | 861 | return err; |
860 | } | 862 | } |
861 | return 0; | 863 | return 0; |