From 210b834a964c775387098bbc9e3836d3cd0e9b14 Mon Sep 17 00:00:00 2001 From: David Howells Date: Thu, 11 Apr 2013 02:32:46 +0100 Subject: [PATCH] h8300: Don't use create_proc_read_entry() Don't use create_proc_read_entry() as that is deprecated, but rather use proc_create_data() and seq_file instead. Signed-off-by: David Howells cc: Yoshinori Sato Signed-off-by: Al Viro --- arch/h8300/kernel/gpio.c | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/arch/h8300/kernel/gpio.c b/arch/h8300/kernel/gpio.c index f8a4f5b52697..b02c752cd326 100644 --- a/arch/h8300/kernel/gpio.c +++ b/arch/h8300/kernel/gpio.c @@ -11,6 +11,7 @@ #include #include +#include #include #include #include @@ -138,29 +139,34 @@ static char *port_status(int portno) return result; } -static int gpio_proc_read(char *buf, char **start, off_t offset, - int len, int *unused_i, void *unused_v) +static int gpio_proc_show(struct seq_file *m, void *v) { - int c,outlen; static const char port_name[]="123456789ABCDEFGH"; - outlen = 0; + int c; + for (c = 0; c < MAX_PORT; c++) { if (ddrs[c] == NULL) - continue ; - len = sprintf(buf,"P%c: %s\n",port_name[c],port_status(c)); - buf += len; - outlen += len; + continue; + seq_printf(m, "P%c: %s\n", port_name[c], port_status(c)); } - return outlen; + return 0; } +static int gpio_proc_open(struct inode *inode, struct file *file) +{ + return single_open(file, gpio_proc_show, PDE_DATA(inode)); +} + +static const struct file_operations gpio_proc_fops = { + .open = gpio_proc_open, + .read = seq_read, + .llseek = seq_lseek, + .release = seq_release, +}; + static __init int register_proc(void) { - struct proc_dir_entry *proc_gpio; - - proc_gpio = create_proc_read_entry("gpio", S_IRUGO, NULL, - gpio_proc_read, NULL); - return proc_gpio != NULL; + return proc_create("gpio", S_IRUGO, NULL, &gpio_proc_fops) != NULL; } __initcall(register_proc);