Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c810a399 authored by Sachin Kamat's avatar Sachin Kamat Committed by Greg Kroah-Hartman
Browse files

staging: Android: Fix some checkpatch warnings 



Warnings reported by checkpatch.pl have been fixed.

Cc: Brian Swetland <swetland@google.com>
Signed-off-by: default avatarSachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2f0b9d08

drivers/staging/android/ashmem.c

+8 −6
Original line number Diff line number Diff line
@@ -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);

drivers/staging/android/logger.c

+6 −4
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ 
 * GNU General Public License for more details.

 */



#define pr_fmt(fmt) "logger: " fmt



#include <linux/sched.h>

#include <linux/module.h>

#include <linux/fs.h>
@@ -621,12 +623,12 @@ static int __init create_log(char *log_name, int size) 
	/* finally, initialize the misc device for this log */

	ret = misc_register(&log->misc);

	if (unlikely(ret)) {

		printk(KERN_ERR "logger: failed to register misc "

		       "device for log '%s'!\n", log->misc.name);

		pr_err("failed to register misc device for log '%s'!\n",

				log->misc.name);

		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);



	return 0;

drivers/staging/android/ram_console.c

+3 −1
Original line number Diff line number Diff line
@@ -13,6 +13,8 @@ 
 *

 */



#define pr_fmt(fmt) "ram_console: " fmt



#include <linux/console.h>

#include <linux/init.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);

	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);

		return 0;

	}

drivers/staging/android/timed_output.c

+3 −1
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ 
 *

 */



#define pr_fmt(fmt) "timed_output: " fmt



#include <linux/module.h>

#include <linux/types.h>

#include <linux/device.h>
@@ -90,7 +92,7 @@ int timed_output_dev_register(struct timed_output_dev *tdev) 


err_create_file:

	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);



	return ret;