aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2009-05-11 17:00:41 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2009-06-19 11:00:52 -0700
commite93daf9f8d94b9dc31a66e3ae76d7fdf80b1cb7d (patch)
treec93620f849c098db76ef9cfa26dabd7ab00e301e
parent66b20608c9e98a0a29806bd47b30565927fdbbd8 (diff)
Staging: android: ram_console: fix up remaining checkpatch warnings
This cleans up the last of the checkpatch warnings in the android ram_console driver. Cc: San Mehat <san@android.com> Cc: Arve Hjønnevåg <arve@android.com> Cc: David Rientjes <rientjes@google.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/staging/android/ram_console.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/staging/android/ram_console.c b/drivers/staging/android/ram_console.c
index 3375c1cce2b..8f18a59744c 100644
--- a/drivers/staging/android/ram_console.c
+++ b/drivers/staging/android/ram_console.c
@@ -20,7 +20,7 @@
#include <linux/proc_fs.h>
#include <linux/string.h>
#include <linux/uaccess.h>
-#include <asm/io.h>
+#include <linux/io.h>
#ifdef CONFIG_ANDROID_RAM_CONSOLE_ERROR_CORRECTION
#include <linux/rslib.h>
@@ -225,8 +225,9 @@ static int __init ram_console_init(struct ram_console_buffer *buffer,
buffer_size - sizeof(struct ram_console_buffer);
if (ram_console_buffer_size > buffer_size) {
- pr_err("ram_console: buffer %p, invalid size %zu, datasize %zu\n",
- buffer, buffer_size, ram_console_buffer_size);
+ pr_err("ram_console: buffer %p, invalid size %zu, "
+ "datasize %zu\n", buffer, buffer_size,
+ ram_console_buffer_size);
return 0;
}
@@ -365,7 +366,7 @@ static ssize_t ram_console_read_old(struct file *file, char __user *buf,
return count;
}
-static struct file_operations ram_console_file_ops = {
+static const struct file_operations ram_console_file_ops = {
.owner = THIS_MODULE,
.read = ram_console_read_old,
};