Skip to content

Commit

Permalink
h8300: Don't use create_proc_read_entry()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
David Howells authored and Al Viro committed Apr 29, 2013
1 parent e781c3d commit 210b834
Showing 1 changed file with 20 additions and 14 deletions.
34 changes: 20 additions & 14 deletions arch/h8300/kernel/gpio.c
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

#include <linux/stddef.h>
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
#include <linux/kernel.h>
#include <linux/string.h>
#include <linux/fs.h>
Expand Down Expand Up @@ -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 __init int register_proc(void)
static int gpio_proc_open(struct inode *inode, struct file *file)
{
struct proc_dir_entry *proc_gpio;
return single_open(file, gpio_proc_show, PDE_DATA(inode));
}

proc_gpio = create_proc_read_entry("gpio", S_IRUGO, NULL,
gpio_proc_read, NULL);
return proc_gpio != NULL;
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)
{
return proc_create("gpio", S_IRUGO, NULL, &gpio_proc_fops) != NULL;
}

__initcall(register_proc);
Expand Down

0 comments on commit 210b834

Please sign in to comment.