Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756749AbYK0Kni (ORCPT ); Thu, 27 Nov 2008 05:43:38 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754690AbYK0KdJ (ORCPT ); Thu, 27 Nov 2008 05:33:09 -0500 Received: from mtagate7.de.ibm.com ([195.212.29.156]:62907 "EHLO mtagate7.de.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752594AbYK0Kc1 (ORCPT ); Thu, 27 Nov 2008 05:32:27 -0500 Message-Id: <20081127103137.838937949@de.ibm.com> References: <20081127103020.528516828@de.ibm.com> User-Agent: quilt/0.46-1 Date: Thu, 27 Nov 2008 11:30:56 +0100 From: Martin Schwidefsky To: linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org Cc: Heiko Carstens , Christian Borntraeger , Martin Schwidefsky Subject: [patch 36/60] convert vmcp printks to pr_xxx macros. Content-Disposition: inline; filename=151-kmsg-vmcp.diff Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1608 Lines: 54 From: Christian Borntraeger Signed-off-by: Christian Borntraeger Signed-off-by: Martin Schwidefsky --- 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 #include #include @@ -25,8 +28,6 @@ MODULE_LICENSE("GPL"); MODULE_AUTHOR("Christian Borntraeger "); 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@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/