fs/pstore: logging clean-up

- Define pr_fmt in plateform.c and ram_core.c for global prefix.

- Coalesce format fragments.

- Separate format/arguments on lines > 80 characters.

Note: Some pr_foo() were initially declared without prefix and therefore
this could break existing log analyzer.

[akpm@linux-foundation.org: missed a couple of prefix removals]
Signed-off-by: Fabian Frederick <fabf@skynet.be>
Cc: Joe Perches <joe@perches.com>
Cc: Anton Vorontsov <anton@enomsg.org>
Cc: Colin Cross <ccross@android.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 9 insertions, 10 deletions

diff --git a/fs/pstore/platform.c b/fs/pstore/platform.c
index 46d269e38706..0a9b72cdfeca 100644
--- a/fs/pstore/platform.c
+++ b/fs/pstore/platform.c
@@ -18,6 +18,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#define pr_fmt(fmt) "pstore: " fmt
+
 #include <linux/atomic.h>
 #include <linux/types.h>
 #include <linux/errno.h>
@@ -224,14 +226,12 @@ static void allocate_buf_for_compression(void)
                         zlib_inflate_workspacesize());
                 stream.workspace = kmalloc(size, GFP_KERNEL);
                 if (!stream.workspace) {
-                        pr_err("pstore: No memory for compression workspace; "
-                                "skipping compression\n");
+                        pr_err("No memory for compression workspace; skipping compression\n");
                         kfree(big_oops_buf);
                         big_oops_buf = NULL;
                 }
         } else {
-                pr_err("No memory for uncompressed data; "
-                        "skipping compression\n");
+                pr_err("No memory for uncompressed data; skipping compression\n");
                 stream.workspace = NULL;
         }
 
@@ -455,8 +455,7 @@ int pstore_register(struct pstore_info *psi)
                 add_timer(&pstore_timer);
         }
 
-        pr_info("pstore: Registered %s as persistent store backend\n",
-                psi->name);
+        pr_info("Registered %s as persistent store backend\n", psi->name);
 
         return 0;
 }
@@ -502,8 +501,8 @@ void pstore_get_records(int quiet)
                                 size = unzipped_len;
                                 compressed = false;
                         } else {
-                                pr_err("pstore: decompression failed;"
-                                        "returned %d\n", unzipped_len);
+                                pr_err("decompression failed;returned %d\n",
+                                       unzipped_len);
                                 compressed = true;
                         }
                 }
@@ -524,8 +523,8 @@ out:
         mutex_unlock(&psi->read_mutex);
 
         if (failed)
-                printk(KERN_WARNING "pstore: failed to load %d record(s) from '%s'\n",
-                       failed, psi->name);
+                pr_warn("failed to load %d record(s) from '%s'\n",
+                        failed, psi->name);
 }
 
 static void pstore_dowork(struct work_struct *work)