Merge tag 'for-linus-3.16-merge-window' of git://git.kernel.org/pub/scm/linux/kernel...

[cascardo/linux.git] / fs / cachefiles / main.c

diff --git a/fs/cachefiles/main.c b/fs/cachefiles/main.c
index 4bfa8cf..180edfb 100644 (file)
--- a/fs/cachefiles/main.c
+++ b/fs/cachefiles/main.c
@@ -68,8 +68,7 @@ static int __init cachefiles_init(void)
                                  SLAB_HWCACHE_ALIGN,
                                  cachefiles_object_init_once);
        if (!cachefiles_object_jar) {
-               printk(KERN_NOTICE
-                      "CacheFiles: Failed to allocate an object jar\n");
+               pr_notice("Failed to allocate an object jar\n");
                goto error_object_jar;
        }
 
@@ -77,7 +76,7 @@ static int __init cachefiles_init(void)
        if (ret < 0)
                goto error_proc;
 
-       printk(KERN_INFO "CacheFiles: Loaded\n");
+       pr_info("Loaded\n");
        return 0;
 
 error_proc:
@@ -85,7 +84,7 @@ error_proc:
 error_object_jar:
        misc_deregister(&cachefiles_dev);
 error_dev:
-       kerror("failed to register: %d", ret);
+       pr_err("failed to register: %d", ret);
        return ret;
 }
 
@@ -96,7 +95,7 @@ fs_initcall(cachefiles_init);
  */
 static void __exit cachefiles_exit(void)
 {
-       printk(KERN_INFO "CacheFiles: Unloading\n");
+       pr_info("Unloading\n");
 
        cachefiles_proc_cleanup();
        kmem_cache_destroy(cachefiles_object_jar);