Commit 80a5c36d authored by Frank Munzert's avatar Frank Munzert Committed by Martin Schwidefsky

[S390] convert vmur printks to pr_xxx macros.

Signed-off-by: default avatarFrank Munzert <munzert@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 2f526e5a
...@@ -8,6 +8,9 @@ ...@@ -8,6 +8,9 @@
* Frank Munzert <munzert@de.ibm.com> * Frank Munzert <munzert@de.ibm.com>
*/ */
#define KMSG_COMPONENT "vmur"
#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
#include <linux/cdev.h> #include <linux/cdev.h>
#include <linux/smp_lock.h> #include <linux/smp_lock.h>
...@@ -40,8 +43,6 @@ MODULE_AUTHOR("IBM Corporation"); ...@@ -40,8 +43,6 @@ MODULE_AUTHOR("IBM Corporation");
MODULE_DESCRIPTION("s390 z/VM virtual unit record device driver"); MODULE_DESCRIPTION("s390 z/VM virtual unit record device driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
#define PRINTK_HEADER "vmur: "
static dev_t ur_first_dev_maj_min; static dev_t ur_first_dev_maj_min;
static struct class *vmur_class; static struct class *vmur_class;
static struct debug_info *vmur_dbf; static struct debug_info *vmur_dbf;
...@@ -987,7 +988,8 @@ static int __init ur_init(void) ...@@ -987,7 +988,8 @@ static int __init ur_init(void)
dev_t dev; dev_t dev;
if (!MACHINE_IS_VM) { if (!MACHINE_IS_VM) {
PRINT_ERR("%s is only available under z/VM.\n", ur_banner); pr_err("The %s cannot be loaded without z/VM\n",
ur_banner);
return -ENODEV; return -ENODEV;
} }
...@@ -1006,7 +1008,8 @@ static int __init ur_init(void) ...@@ -1006,7 +1008,8 @@ static int __init ur_init(void)
rc = alloc_chrdev_region(&dev, 0, NUM_MINORS, "vmur"); rc = alloc_chrdev_region(&dev, 0, NUM_MINORS, "vmur");
if (rc) { if (rc) {
PRINT_ERR("alloc_chrdev_region failed: err = %d\n", rc); pr_err("Kernel function alloc_chrdev_region failed with "
"error code %d\n", rc);
goto fail_unregister_driver; goto fail_unregister_driver;
} }
ur_first_dev_maj_min = MKDEV(MAJOR(dev), 0); ur_first_dev_maj_min = MKDEV(MAJOR(dev), 0);
...@@ -1016,7 +1019,7 @@ static int __init ur_init(void) ...@@ -1016,7 +1019,7 @@ static int __init ur_init(void)
rc = PTR_ERR(vmur_class); rc = PTR_ERR(vmur_class);
goto fail_unregister_region; goto fail_unregister_region;
} }
PRINT_INFO("%s loaded.\n", ur_banner); pr_info("%s loaded.\n", ur_banner);
return 0; return 0;
fail_unregister_region: fail_unregister_region:
...@@ -1034,7 +1037,7 @@ static void __exit ur_exit(void) ...@@ -1034,7 +1037,7 @@ static void __exit ur_exit(void)
unregister_chrdev_region(ur_first_dev_maj_min, NUM_MINORS); unregister_chrdev_region(ur_first_dev_maj_min, NUM_MINORS);
ccw_driver_unregister(&ur_driver); ccw_driver_unregister(&ur_driver);
debug_unregister(vmur_dbf); debug_unregister(vmur_dbf);
PRINT_INFO("%s unloaded.\n", ur_banner); pr_info("%s unloaded.\n", ur_banner);
} }
module_init(ur_init); module_init(ur_init);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment