iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[S390] convert vmlogrdr printks to pr_xxx macros.

Browse Source 
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
This commit is contained in:
Martin Schwidefsky 2008-12-25 13:39:52 +01:00
parent 17159dc6fb
commit 5466c2e43e
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/s390/char/vmlogrdr.c
View File

@ -10,6 +10,10 @@
* Stefan Weinhuber <wein@de.ibm.com> * Stefan Weinhuber <wein@de.ibm.com>
* *
*/ */
#define KMSG_COMPONENT "vmlogrdr"
#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
#include <linux/module.h> #include <linux/module.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/errno.h> #include <linux/errno.h>
@ -28,8 +32,6 @@
#include <linux/smp_lock.h> #include <linux/smp_lock.h>
#include <linux/string.h> #include <linux/string.h>
MODULE_AUTHOR MODULE_AUTHOR
("(C) 2004 IBM Corporation by Xenia Tkatschow (xenia@us.ibm.com)\n" ("(C) 2004 IBM Corporation by Xenia Tkatschow (xenia@us.ibm.com)\n"
" Stefan Weinhuber (wein@de.ibm.com)"); " Stefan Weinhuber (wein@de.ibm.com)");
@ -174,8 +176,7 @@ static void vmlogrdr_iucv_path_severed(struct iucv_path *path, u8 ipuser[16])
struct vmlogrdr_priv_t * logptr = path->private; struct vmlogrdr_priv_t * logptr = path->private;
u8 reason = (u8) ipuser[8]; u8 reason = (u8) ipuser[8];
printk (KERN_ERR "vmlogrdr: connection severed with" pr_err("vmlogrdr: connection severed with reason %i\n", reason);
" reason %i\n", reason);
iucv_path_sever(path, NULL); iucv_path_sever(path, NULL);
kfree(path); kfree(path);
@ -333,8 +334,8 @@ static int vmlogrdr_open (struct inode *inode, struct file *filp)
if (logptr->autorecording) { if (logptr->autorecording) {
ret = vmlogrdr_recording(logptr,1,logptr->autopurge); ret = vmlogrdr_recording(logptr,1,logptr->autopurge);
if (ret) if (ret)
printk (KERN_WARNING "vmlogrdr: failed to start " pr_warning("vmlogrdr: failed to start "
"recording automatically\n"); "recording automatically\n");
} }
/* create connection to the system service */ /* create connection to the system service */
@ -345,9 +346,9 @@ static int vmlogrdr_open (struct inode *inode, struct file *filp)
logptr->system_service, NULL, NULL, logptr->system_service, NULL, NULL,
logptr); logptr);
if (connect_rc) { if (connect_rc) {
printk (KERN_ERR "vmlogrdr: iucv connection to %s " pr_err("vmlogrdr: iucv connection to %s "
"failed with rc %i \n", logptr->system_service, "failed with rc %i \n",
connect_rc); logptr->system_service, connect_rc);
goto out_path; goto out_path;
} }
@ -388,8 +389,8 @@ static int vmlogrdr_release (struct inode *inode, struct file *filp)
if (logptr->autorecording) { if (logptr->autorecording) {
ret = vmlogrdr_recording(logptr,0,logptr->autopurge); ret = vmlogrdr_recording(logptr,0,logptr->autopurge);
if (ret) if (ret)
printk (KERN_WARNING "vmlogrdr: failed to stop " pr_warning("vmlogrdr: failed to stop "
"recording automatically\n"); "recording automatically\n");
} }
logptr->dev_in_use = 0; logptr->dev_in_use = 0;
@ -823,8 +824,7 @@ static int __init vmlogrdr_init(void)
dev_t dev; dev_t dev;
if (! MACHINE_IS_VM) { if (! MACHINE_IS_VM) {
printk (KERN_ERR "vmlogrdr: not running under VM, " pr_err("not running under VM, driver not loaded.\n");
"driver not loaded.\n");
return -ENODEV; return -ENODEV;
} }