Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755784AbYK0KsM (ORCPT ); Thu, 27 Nov 2008 05:48:12 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754794AbYK0Kdc (ORCPT ); Thu, 27 Nov 2008 05:33:32 -0500 Received: from mtagate4.de.ibm.com ([195.212.29.153]:46066 "EHLO mtagate4.de.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753900AbYK0Kcc (ORCPT ); Thu, 27 Nov 2008 05:32:32 -0500 Message-Id: <20081127103143.772706128@de.ibm.com> References: <20081127103020.528516828@de.ibm.com> User-Agent: quilt/0.46-1 Date: Thu, 27 Nov 2008 11:31:17 +0100 From: Martin Schwidefsky To: linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org Cc: Heiko Carstens , Christof Schmitt , Martin Schwidefsky Subject: [patch 57/60] convert zfcp printks to pr_xxx macros. Content-Disposition: inline; filename=172-kmsg-zfcp.diff Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 5857 Lines: 195 From: Christof Schmitt Signed-off-by: Christof Schmitt Signed-off-by: Martin Schwidefsky --- drivers/s390/scsi/zfcp_aux.c | 9 ++++++--- drivers/s390/scsi/zfcp_ccw.c | 3 +++ drivers/s390/scsi/zfcp_cfdc.c | 3 +++ drivers/s390/scsi/zfcp_dbf.c | 3 +++ drivers/s390/scsi/zfcp_erp.c | 3 +++ drivers/s390/scsi/zfcp_fc.c | 3 +++ drivers/s390/scsi/zfcp_fsf.c | 3 +++ drivers/s390/scsi/zfcp_qdio.c | 3 +++ drivers/s390/scsi/zfcp_scsi.c | 3 +++ drivers/s390/scsi/zfcp_sysfs.c | 3 +++ 10 files changed, 33 insertions(+), 3 deletions(-) Index: quilt-2.6/drivers/s390/scsi/zfcp_aux.c =================================================================== --- quilt-2.6.orig/drivers/s390/scsi/zfcp_aux.c +++ quilt-2.6/drivers/s390/scsi/zfcp_aux.c @@ -25,6 +25,9 @@ * Sven Schuetz */ +#define KMSG_COMPONENT "zfcp" +#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt + #include #include #include "zfcp_ext.h" @@ -105,7 +108,7 @@ static int __init zfcp_device_setup(char err_out: kfree(str); - pr_err("zfcp: %s is not a valid SCSI device\n", devstr); + pr_err("%s is not a valid SCSI device\n", devstr); return 0; } @@ -189,13 +192,13 @@ static int __init zfcp_module_init(void) retval = misc_register(&zfcp_cfdc_misc); if (retval) { - pr_err("zfcp: Registering the misc device zfcp_cfdc failed\n"); + pr_err("Registering the misc device zfcp_cfdc failed\n"); goto out_misc; } retval = zfcp_ccw_register(); if (retval) { - pr_err("zfcp: The zfcp device driver could not register with " + pr_err("The zfcp device driver could not register with " "the common I/O layer\n"); goto out_ccw_register; } Index: quilt-2.6/drivers/s390/scsi/zfcp_ccw.c =================================================================== --- quilt-2.6.orig/drivers/s390/scsi/zfcp_ccw.c +++ quilt-2.6/drivers/s390/scsi/zfcp_ccw.c @@ -6,6 +6,9 @@ * Copyright IBM Corporation 2002, 2008 */ +#define KMSG_COMPONENT "zfcp" +#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt + #include "zfcp_ext.h" /** Index: quilt-2.6/drivers/s390/scsi/zfcp_cfdc.c =================================================================== --- quilt-2.6.orig/drivers/s390/scsi/zfcp_cfdc.c +++ quilt-2.6/drivers/s390/scsi/zfcp_cfdc.c @@ -7,6 +7,9 @@ * Copyright IBM Corporation 2008 */ +#define KMSG_COMPONENT "zfcp" +#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt + #include #include #include Index: quilt-2.6/drivers/s390/scsi/zfcp_dbf.c =================================================================== --- quilt-2.6.orig/drivers/s390/scsi/zfcp_dbf.c +++ quilt-2.6/drivers/s390/scsi/zfcp_dbf.c @@ -6,6 +6,9 @@ * Copyright IBM Corporation 2002, 2008 */ +#define KMSG_COMPONENT "zfcp" +#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt + #include #include #include "zfcp_ext.h" Index: quilt-2.6/drivers/s390/scsi/zfcp_erp.c =================================================================== --- quilt-2.6.orig/drivers/s390/scsi/zfcp_erp.c +++ quilt-2.6/drivers/s390/scsi/zfcp_erp.c @@ -6,6 +6,9 @@ * Copyright IBM Corporation 2002, 2008 */ +#define KMSG_COMPONENT "zfcp" +#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt + #include "zfcp_ext.h" #define ZFCP_MAX_ERPS 3 Index: quilt-2.6/drivers/s390/scsi/zfcp_fc.c =================================================================== --- quilt-2.6.orig/drivers/s390/scsi/zfcp_fc.c +++ quilt-2.6/drivers/s390/scsi/zfcp_fc.c @@ -6,6 +6,9 @@ * Copyright IBM Corporation 2008 */ +#define KMSG_COMPONENT "zfcp" +#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt + #include "zfcp_ext.h" struct ct_iu_gpn_ft_req { Index: quilt-2.6/drivers/s390/scsi/zfcp_fsf.c =================================================================== --- quilt-2.6.orig/drivers/s390/scsi/zfcp_fsf.c +++ quilt-2.6/drivers/s390/scsi/zfcp_fsf.c @@ -6,6 +6,9 @@ * Copyright IBM Corporation 2002, 2008 */ +#define KMSG_COMPONENT "zfcp" +#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt + #include #include "zfcp_ext.h" Index: quilt-2.6/drivers/s390/scsi/zfcp_qdio.c =================================================================== --- quilt-2.6.orig/drivers/s390/scsi/zfcp_qdio.c +++ quilt-2.6/drivers/s390/scsi/zfcp_qdio.c @@ -6,6 +6,9 @@ * Copyright IBM Corporation 2002, 2008 */ +#define KMSG_COMPONENT "zfcp" +#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt + #include "zfcp_ext.h" /* FIXME(tune): free space should be one max. SBAL chain plus what? */ Index: quilt-2.6/drivers/s390/scsi/zfcp_scsi.c =================================================================== --- quilt-2.6.orig/drivers/s390/scsi/zfcp_scsi.c +++ quilt-2.6/drivers/s390/scsi/zfcp_scsi.c @@ -6,6 +6,9 @@ * Copyright IBM Corporation 2002, 2008 */ +#define KMSG_COMPONENT "zfcp" +#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt + #include "zfcp_ext.h" #include Index: quilt-2.6/drivers/s390/scsi/zfcp_sysfs.c =================================================================== --- quilt-2.6.orig/drivers/s390/scsi/zfcp_sysfs.c +++ quilt-2.6/drivers/s390/scsi/zfcp_sysfs.c @@ -6,6 +6,9 @@ * Copyright IBM Corporation 2008 */ +#define KMSG_COMPONENT "zfcp" +#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt + #include "zfcp_ext.h" #define ZFCP_DEV_ATTR(_feat, _name, _mode, _show, _store) \ -- 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/