2008-11-27 10:47:49

by Martin Schwidefsky

[permalink] [raw]
Subject: [patch 50/60] convert ap_bus printks to pr_xxx macros.

From: Martin Schwidefsky <[email protected]>

Signed-off-by: Martin Schwidefsky <[email protected]>
---

drivers/s390/crypto/ap_bus.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)

Index: quilt-2.6/drivers/s390/crypto/ap_bus.c
===================================================================
--- quilt-2.6.orig/drivers/s390/crypto/ap_bus.c
+++ quilt-2.6/drivers/s390/crypto/ap_bus.c
@@ -24,6 +24,9 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/

+#define KMSG_COMPONENT "ap"
+#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
+
#include <linux/module.h>
#include <linux/init.h>
#include <linux/delay.h>
@@ -1487,12 +1490,13 @@ int __init ap_module_init(void)
int rc, i;

if (ap_domain_index < -1 || ap_domain_index >= AP_DOMAINS) {
- printk(KERN_WARNING "Invalid param: domain = %d. "
- " Not loading.\n", ap_domain_index);
+ pr_warning("%d is not a valid cryptographic domain\n",
+ ap_domain_index);
return -EINVAL;
}
if (ap_instructions_available() != 0) {
- printk(KERN_WARNING "AP instructions not installed.\n");
+ pr_warning("The hardware system does not support "
+ "AP instructions\n");
return -ENODEV;
}
if (ap_interrupts_available()) {

--
blue skies,
Martin.

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