[patch 36/60] convert vmcp printks to pr_xxx macros.

From: Martin Schwidefsky
Date: Thu Nov 27 2008 - 05:43:38 EST


From: Christian Borntraeger <borntraeger@xxxxxxxxxx>

Signed-off-by: Christian Borntraeger <borntraeger@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
---

drivers/s390/char/vmcp.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)

Index: quilt-2.6/drivers/s390/char/vmcp.c
===================================================================
--- quilt-2.6.orig/drivers/s390/char/vmcp.c
+++ quilt-2.6/drivers/s390/char/vmcp.c
@@ -11,6 +11,9 @@
* The idea of this driver is based on cpint from Neale Ferguson and #CP in CMS
*/

+#define KMSG_COMPONENT "vmcp"
+#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
+
#include <linux/fs.h>
#include <linux/init.h>
#include <linux/kernel.h>
@@ -25,8 +28,6 @@ MODULE_LICENSE("GPL");
MODULE_AUTHOR("Christian Borntraeger <borntraeger@xxxxxxxxxx>");
MODULE_DESCRIPTION("z/VM CP interface");

-#define PRINTK_HEADER "vmcp: "
-
static debug_info_t *vmcp_debug;

static int vmcp_open(struct inode *inode, struct file *file)
@@ -190,7 +191,8 @@ static int __init vmcp_init(void)
int ret;

if (!MACHINE_IS_VM) {
- PRINT_WARN("z/VM CP interface is only available under z/VM\n");
+ pr_warning("The z/VM CP interface device driver cannot be "
+ "loaded without z/VM\n");
return -ENODEV;
}


--
blue skies,
Martin.

"Reality continues to ruin my life." - Calvin.

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/