Merge branch 'master' of git://git.infradead.org/users/dedekind/mtd-tests-2.6

[mv-sheeva.git] / arch / s390 / appldata / appldata_base.c

diff --git a/arch/s390/appldata/appldata_base.c b/arch/s390/appldata/appldata_base.c
index a06a47cdd5e06e30efbde7f92b882fd2c948c610..27b70d8a359cd6b9816453626c0fdc6e80789f12 100644 (file)
--- a/arch/s390/appldata/appldata_base.c
+++ b/arch/s390/appldata/appldata_base.c
@@ -10,6 +10,9 @@
  * Author: Gerald Schaefer <gerald.schaefer@de.ibm.com>
  */
 
+#define KMSG_COMPONENT "appldata"
+#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
+
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>
@@ -32,7 +35,6 @@
 #include "appldata.h"
 
 
-#define MY_PRINT_NAME  "appldata"              /* for debug messages, etc. */
 #define APPLDATA_CPU_INTERVAL  10000           /* default (CPU) time for
                                                   sampling interval in
                                                   milliseconds */
@@ -390,8 +392,8 @@ appldata_generic_handler(ctl_table *ctl, int write, struct file *filp,
                                        (unsigned long) ops->data, ops->size,
                                        ops->mod_lvl);
                if (rc != 0) {
-                       P_ERROR("START DIAG 0xDC for %s failed, "
-                               "return code: %d\n", ops->name, rc);
+                       pr_err("Starting the data collection for %s "
+                              "failed with rc=%d\n", ops->name, rc);
                        module_put(ops->owner);
                } else
                        ops->active = 1;
@@ -401,8 +403,8 @@ appldata_generic_handler(ctl_table *ctl, int write, struct file *filp,
                                (unsigned long) ops->data, ops->size,
                                ops->mod_lvl);
                if (rc != 0)
-                       P_ERROR("STOP DIAG 0xDC for %s failed, "
-                               "return code: %d\n", ops->name, rc);
+                       pr_err("Stopping the data collection for %s "
+                              "failed with rc=%d\n", ops->name, rc);
                module_put(ops->owner);
        }
        spin_unlock(&appldata_ops_lock);