summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexey Dobriyan <adobriyan@gmail.com>2009-12-05 03:27:29 +0300
committerMike Frysinger <vapier@gentoo.org>2009-12-15 00:16:49 -0500
commit397b761cc42e2c56f8de07de680486892448b628 (patch)
tree77d15a1f1db434cad6d94ef73b03bdae292ef922
parentc768a943fd8f41f5f7ed33c91d50818b301f5635 (diff)
Blackfin: convert kgdbtest to proc_fops
The read_proc and write_proc interfaces are going to be removed in the common kernel code. Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
-rw-r--r--arch/blackfin/kernel/kgdb_test.c39
1 files changed, 12 insertions, 27 deletions
diff --git a/arch/blackfin/kernel/kgdb_test.c b/arch/blackfin/kernel/kgdb_test.c
index 59fc42dc5d6..6fc4e5f6226 100644
--- a/arch/blackfin/kernel/kgdb_test.c
+++ b/arch/blackfin/kernel/kgdb_test.c
@@ -18,7 +18,7 @@
#include <asm/blackfin.h>
static char cmdline[256];
-static unsigned long len;
+static size_t len;
#ifndef CONFIG_SMP
static int num1 __attribute__((l1_data));
@@ -59,7 +59,8 @@ int kgdb_test(char *name, int len, int count, int z)
return count;
}
-static int test_proc_output(char *buf)
+static ssize_t kgdb_test_proc_read(struct file *file, char __user *buf,
+ size_t count, loff_t *ppos)
{
kgdb_test("hello world!", 12, 0x55, 0x10);
#ifndef CONFIG_SMP
@@ -72,25 +73,8 @@ static int test_proc_output(char *buf)
return 0;
}
-static int test_read_proc(char *page, char **start, off_t off,
- int count, int *eof, void *data)
-{
- int len;
-
- len = test_proc_output(page);
- if (len <= off+count)
- *eof = 1;
- *start = page + off;
- len -= off;
- if (len > count)
- len = count;
- if (len < 0)
- len = 0;
- return len;
-}
-
-static int test_write_proc(struct file *file, const char *buffer,
- unsigned long count, void *data)
+static ssize_t kgdb_test_proc_write(struct file *file,
+ const char __user *buffer, size_t count, loff_t *pos)
{
if (count >= 256)
len = 255;
@@ -103,18 +87,19 @@ static int test_write_proc(struct file *file, const char *buffer,
return len;
}
+static const struct file_operations kgdb_test_proc_fops = {
+ .owner = THIS_MODULE,
+ .read = kgdb_test_proc_read,
+ .write = kgdb_test_proc_write,
+};
+
static int __init kgdbtest_init(void)
{
struct proc_dir_entry *entry;
- entry = create_proc_entry("kgdbtest", 0, NULL);
+ entry = proc_create("kgdbtest", 0, NULL, &kgdb_test_proc_fops);
if (entry == NULL)
return -ENOMEM;
-
- entry->read_proc = test_read_proc;
- entry->write_proc = test_write_proc;
- entry->data = NULL;
-
return 0;
}