aboutsummaryrefslogtreecommitdiffstats
path: root/arch/h8300/kernel
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2013-04-10 21:32:46 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2013-04-29 15:41:59 -0400
commit210b834a964c775387098bbc9e3836d3cd0e9b14 (patch)
tree7555f43506eda5dcbf12d64afc8fca6a58e448f2 /arch/h8300/kernel
parente781c3d794282d9fa3ba377fdef221fc948974ec (diff)
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 <dhowells@redhat.com> cc: Yoshinori Sato <ysato@users.sourceforge.jp> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch/h8300/kernel')
-rw-r--r--arch/h8300/kernel/gpio.c34
1 files 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 @@
11 11
12#include <linux/stddef.h> 12#include <linux/stddef.h>
13#include <linux/proc_fs.h> 13#include <linux/proc_fs.h>
14#include <linux/seq_file.h>
14#include <linux/kernel.h> 15#include <linux/kernel.h>
15#include <linux/string.h> 16#include <linux/string.h>
16#include <linux/fs.h> 17#include <linux/fs.h>
@@ -138,29 +139,34 @@ static char *port_status(int portno)
138 return result; 139 return result;
139} 140}
140 141
141static int gpio_proc_read(char *buf, char **start, off_t offset, 142static int gpio_proc_show(struct seq_file *m, void *v)
142 int len, int *unused_i, void *unused_v)
143{ 143{
144 int c,outlen;
145 static const char port_name[]="123456789ABCDEFGH"; 144 static const char port_name[]="123456789ABCDEFGH";
146 outlen = 0; 145 int c;
146
147 for (c = 0; c < MAX_PORT; c++) { 147 for (c = 0; c < MAX_PORT; c++) {
148 if (ddrs[c] == NULL) 148 if (ddrs[c] == NULL)
149 continue ; 149 continue;
150 len = sprintf(buf,"P%c: %s\n",port_name[c],port_status(c)); 150 seq_printf(m, "P%c: %s\n", port_name[c], port_status(c));
151 buf += len;
152 outlen += len;
153 } 151 }
154 return outlen; 152 return 0;
155} 153}
156 154
157static __init int register_proc(void) 155static int gpio_proc_open(struct inode *inode, struct file *file)
158{ 156{
159 struct proc_dir_entry *proc_gpio; 157 return single_open(file, gpio_proc_show, PDE_DATA(inode));
158}
160 159
161 proc_gpio = create_proc_read_entry("gpio", S_IRUGO, NULL, 160static const struct file_operations gpio_proc_fops = {
162 gpio_proc_read, NULL); 161 .open = gpio_proc_open,
163 return proc_gpio != NULL; 162 .read = seq_read,
163 .llseek = seq_lseek,
164 .release = seq_release,
165};
166
167static __init int register_proc(void)
168{
169 return proc_create("gpio", S_IRUGO, NULL, &gpio_proc_fops) != NULL;
164} 170}
165 171
166__initcall(register_proc); 172__initcall(register_proc);