Skip to content

Commit

Permalink
[S390] convert vmlogrdr printks to pr_xxx macros.
Browse files Browse the repository at this point in the history
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
  • Loading branch information
Martin Schwidefsky committed Dec 25, 2008
1 parent 17159dc commit 5466c2e
Showing 1 changed file with 13 additions and 13 deletions.
26 changes: 13 additions & 13 deletions drivers/s390/char/vmlogrdr.c
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@
* Stefan Weinhuber <wein@de.ibm.com>
*
*/

#define KMSG_COMPONENT "vmlogrdr"
#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt

#include <linux/module.h>
#include <linux/init.h>
#include <linux/errno.h>
Expand All @@ -28,8 +32,6 @@
#include <linux/smp_lock.h>
#include <linux/string.h>



MODULE_AUTHOR
("(C) 2004 IBM Corporation by Xenia Tkatschow (xenia@us.ibm.com)\n"
" Stefan Weinhuber (wein@de.ibm.com)");
Expand Down Expand Up @@ -174,8 +176,7 @@ static void vmlogrdr_iucv_path_severed(struct iucv_path *path, u8 ipuser[16])
struct vmlogrdr_priv_t * logptr = path->private;
u8 reason = (u8) ipuser[8];

printk (KERN_ERR "vmlogrdr: connection severed with"
" reason %i\n", reason);
pr_err("vmlogrdr: connection severed with reason %i\n", reason);

iucv_path_sever(path, NULL);
kfree(path);
Expand Down Expand Up @@ -333,8 +334,8 @@ static int vmlogrdr_open (struct inode *inode, struct file *filp)
if (logptr->autorecording) {
ret = vmlogrdr_recording(logptr,1,logptr->autopurge);
if (ret)
printk (KERN_WARNING "vmlogrdr: failed to start "
"recording automatically\n");
pr_warning("vmlogrdr: failed to start "
"recording automatically\n");
}

/* create connection to the system service */
Expand All @@ -345,9 +346,9 @@ static int vmlogrdr_open (struct inode *inode, struct file *filp)
logptr->system_service, NULL, NULL,
logptr);
if (connect_rc) {
printk (KERN_ERR "vmlogrdr: iucv connection to %s "
"failed with rc %i \n", logptr->system_service,
connect_rc);
pr_err("vmlogrdr: iucv connection to %s "
"failed with rc %i \n",
logptr->system_service, connect_rc);
goto out_path;
}

Expand Down Expand Up @@ -388,8 +389,8 @@ static int vmlogrdr_release (struct inode *inode, struct file *filp)
if (logptr->autorecording) {
ret = vmlogrdr_recording(logptr,0,logptr->autopurge);
if (ret)
printk (KERN_WARNING "vmlogrdr: failed to stop "
"recording automatically\n");
pr_warning("vmlogrdr: failed to stop "
"recording automatically\n");
}
logptr->dev_in_use = 0;

Expand Down Expand Up @@ -823,8 +824,7 @@ static int __init vmlogrdr_init(void)
dev_t dev;

if (! MACHINE_IS_VM) {
printk (KERN_ERR "vmlogrdr: not running under VM, "
"driver not loaded.\n");
pr_err("not running under VM, driver not loaded.\n");
return -ENODEV;
}

Expand Down

0 comments on commit 5466c2e

Please sign in to comment.