aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/s390/char
diff options
context:
space:
mode:
authorMartin Schwidefsky <schwidefsky@de.ibm.com>2008-12-25 07:39:52 -0500
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2008-12-25 07:39:26 -0500
commit5466c2e43e78068cfe634b07fe36dd7a6a7af535 (patch)
tree16f79a06b29633700fd6851f2ddcfa90d92042e4 /drivers/s390/char
parent17159dc6fb8769e52edb23d138c2b6bc634397a3 (diff)
[S390] convert vmlogrdr printks to pr_xxx macros.
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'drivers/s390/char')
-rw-r--r--drivers/s390/char/vmlogrdr.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/drivers/s390/char/vmlogrdr.c b/drivers/s390/char/vmlogrdr.c
index 24762727bc27..aabbeb909cc6 100644
--- a/drivers/s390/char/vmlogrdr.c
+++ b/drivers/s390/char/vmlogrdr.c
@@ -10,6 +10,10 @@
10 * Stefan Weinhuber <wein@de.ibm.com> 10 * Stefan Weinhuber <wein@de.ibm.com>
11 * 11 *
12 */ 12 */
13
14#define KMSG_COMPONENT "vmlogrdr"
15#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
16
13#include <linux/module.h> 17#include <linux/module.h>
14#include <linux/init.h> 18#include <linux/init.h>
15#include <linux/errno.h> 19#include <linux/errno.h>
@@ -28,8 +32,6 @@
28#include <linux/smp_lock.h> 32#include <linux/smp_lock.h>
29#include <linux/string.h> 33#include <linux/string.h>
30 34
31
32
33MODULE_AUTHOR 35MODULE_AUTHOR
34 ("(C) 2004 IBM Corporation by Xenia Tkatschow (xenia@us.ibm.com)\n" 36 ("(C) 2004 IBM Corporation by Xenia Tkatschow (xenia@us.ibm.com)\n"
35 " Stefan Weinhuber (wein@de.ibm.com)"); 37 " Stefan Weinhuber (wein@de.ibm.com)");
@@ -174,8 +176,7 @@ static void vmlogrdr_iucv_path_severed(struct iucv_path *path, u8 ipuser[16])
174 struct vmlogrdr_priv_t * logptr = path->private; 176 struct vmlogrdr_priv_t * logptr = path->private;
175 u8 reason = (u8) ipuser[8]; 177 u8 reason = (u8) ipuser[8];
176 178
177 printk (KERN_ERR "vmlogrdr: connection severed with" 179 pr_err("vmlogrdr: connection severed with reason %i\n", reason);
178 " reason %i\n", reason);
179 180
180 iucv_path_sever(path, NULL); 181 iucv_path_sever(path, NULL);
181 kfree(path); 182 kfree(path);
@@ -333,8 +334,8 @@ static int vmlogrdr_open (struct inode *inode, struct file *filp)
333 if (logptr->autorecording) { 334 if (logptr->autorecording) {
334 ret = vmlogrdr_recording(logptr,1,logptr->autopurge); 335 ret = vmlogrdr_recording(logptr,1,logptr->autopurge);
335 if (ret) 336 if (ret)
336 printk (KERN_WARNING "vmlogrdr: failed to start " 337 pr_warning("vmlogrdr: failed to start "
337 "recording automatically\n"); 338 "recording automatically\n");
338 } 339 }
339 340
340 /* create connection to the system service */ 341 /* create connection to the system service */
@@ -345,9 +346,9 @@ static int vmlogrdr_open (struct inode *inode, struct file *filp)
345 logptr->system_service, NULL, NULL, 346 logptr->system_service, NULL, NULL,
346 logptr); 347 logptr);
347 if (connect_rc) { 348 if (connect_rc) {
348 printk (KERN_ERR "vmlogrdr: iucv connection to %s " 349 pr_err("vmlogrdr: iucv connection to %s "
349 "failed with rc %i \n", logptr->system_service, 350 "failed with rc %i \n",
350 connect_rc); 351 logptr->system_service, connect_rc);
351 goto out_path; 352 goto out_path;
352 } 353 }
353 354
@@ -388,8 +389,8 @@ static int vmlogrdr_release (struct inode *inode, struct file *filp)
388 if (logptr->autorecording) { 389 if (logptr->autorecording) {
389 ret = vmlogrdr_recording(logptr,0,logptr->autopurge); 390 ret = vmlogrdr_recording(logptr,0,logptr->autopurge);
390 if (ret) 391 if (ret)
391 printk (KERN_WARNING "vmlogrdr: failed to stop " 392 pr_warning("vmlogrdr: failed to stop "
392 "recording automatically\n"); 393 "recording automatically\n");
393 } 394 }
394 logptr->dev_in_use = 0; 395 logptr->dev_in_use = 0;
395 396
@@ -823,8 +824,7 @@ static int __init vmlogrdr_init(void)
823 dev_t dev; 824 dev_t dev;
824 825
825 if (! MACHINE_IS_VM) { 826 if (! MACHINE_IS_VM) {
826 printk (KERN_ERR "vmlogrdr: not running under VM, " 827 pr_err("not running under VM, driver not loaded.\n");
827 "driver not loaded.\n");
828 return -ENODEV; 828 return -ENODEV;
829 } 829 }
830 830