Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc

[karo-tx-linux.git] / drivers / staging / android / ashmem.c

diff --git a/drivers/staging/android/ashmem.c b/drivers/staging/android/ashmem.c
index e84dbecd09911715817be0b43339ec65bc956441..69cf2db1d69cdc380b3c9b8af87d5e617a99b11d 100644 (file)
--- a/drivers/staging/android/ashmem.c
+++ b/drivers/staging/android/ashmem.c
@@ -16,6 +16,8 @@
 ** GNU General Public License for more details.
 */
 
+#define pr_fmt(fmt) "ashmem: " fmt
+
 #include <linux/module.h>
 #include <linux/file.h>
 #include <linux/fs.h>
@@ -707,7 +709,7 @@ static int __init ashmem_init(void)
                                          sizeof(struct ashmem_area),
                                          0, 0, NULL);
        if (unlikely(!ashmem_area_cachep)) {
-               printk(KERN_ERR "ashmem: failed to create slab cache\n");
+               pr_err("failed to create slab cache\n");
                return -ENOMEM;
        }
 
@@ -715,19 +717,19 @@ static int __init ashmem_init(void)
                                          sizeof(struct ashmem_range),
                                          0, 0, NULL);
        if (unlikely(!ashmem_range_cachep)) {
-               printk(KERN_ERR "ashmem: failed to create slab cache\n");
+               pr_err("failed to create slab cache\n");
                return -ENOMEM;
        }
 
        ret = misc_register(&ashmem_misc);
        if (unlikely(ret)) {
-               printk(KERN_ERR "ashmem: failed to register misc device!\n");
+               pr_err("failed to register misc device!\n");
                return ret;
        }
 
        register_shrinker(&ashmem_shrinker);
 
-       printk(KERN_INFO "ashmem: initialized\n");
+       pr_info("initialized\n");
 
        return 0;
 }
@@ -740,12 +742,12 @@ static void __exit ashmem_exit(void)
 
        ret = misc_deregister(&ashmem_misc);
        if (unlikely(ret))
-               printk(KERN_ERR "ashmem: failed to unregister misc device!\n");
+               pr_err("failed to unregister misc device!\n");
 
        kmem_cache_destroy(ashmem_range_cachep);
        kmem_cache_destroy(ashmem_area_cachep);
 
-       printk(KERN_INFO "ashmem: unloaded\n");
+       pr_info("unloaded\n");
 }
 
 module_init(ashmem_init);