mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

staging: Android: Fix some checkpatch warnings 

Warnings reported by checkpatch.pl have been fixed.

Cc: Brian Swetland <swetland@google.com>
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Sachin Kamat 2012-06-05 16:40:10 +05:30 committed by Greg Kroah-Hartman
parent 2f0b9d082e
commit c810a39979
4 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/staging/android/ashmem.c
View File

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

10
drivers/staging/android/logger.c
View File

@ -17,6 +17,8 @@
* GNU General Public License for more details. * GNU General Public License for more details.
*/ */
#define pr_fmt(fmt) "logger: " fmt
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/fs.h> #include <linux/fs.h>
@ -621,13 +623,13 @@ static int __init create_log(char *log_name, int size)
/* finally, initialize the misc device for this log */ /* finally, initialize the misc device for this log */
ret = misc_register(&log->misc); ret = misc_register(&log->misc);
if (unlikely(ret)) { if (unlikely(ret)) {
printk(KERN_ERR "logger: failed to register misc " pr_err("failed to register misc device for log '%s'!\n",
"device for log '%s'!\n", log->misc.name); log->misc.name);
goto out_free_log; goto out_free_log;
} }
printk(KERN_INFO "logger: created %luK log '%s'\n", pr_info("created %luK log '%s'\n",
(unsigned long) log->size >> 10, log->misc.name); (unsigned long) log->size >> 10, log->misc.name);
return 0; return 0;

4
drivers/staging/android/ram_console.c
View File

@ -13,6 +13,8 @@
* *
*/ */
#define pr_fmt(fmt) "ram_console: " fmt
#include <linux/console.h> #include <linux/console.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/module.h> #include <linux/module.h>
@ -162,7 +164,7 @@ static int __init ram_console_late_init(void)
entry = create_proc_entry("last_kmsg", S_IFREG | S_IRUGO, NULL); entry = create_proc_entry("last_kmsg", S_IFREG | S_IRUGO, NULL);
if (!entry) { if (!entry) {
printk(KERN_ERR "ram_console: failed to create proc entry\n"); pr_err("failed to create proc entry\n");
persistent_ram_free_old(prz); persistent_ram_free_old(prz);
return 0; return 0;
} }

4
drivers/staging/android/timed_output.c
View File

@ -14,6 +14,8 @@
* *
*/ */
#define pr_fmt(fmt) "timed_output: " fmt
#include <linux/module.h> #include <linux/module.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/device.h> #include <linux/device.h>
@ -90,7 +92,7 @@ int timed_output_dev_register(struct timed_output_dev *tdev)
err_create_file: err_create_file:
device_destroy(timed_output_class, MKDEV(0, tdev->index)); device_destroy(timed_output_class, MKDEV(0, tdev->index));
printk(KERN_ERR "timed_output: Failed to register driver %s\n", pr_err("failed to register driver %s\n",
tdev->name); tdev->name);
return ret; return ret;