adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-27 19:26:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

proc: convert /proc/bus/nubus to seq_file interface

Browse source 
Signed-off-by: Alexey Dobriyan <adobriyan@sw.ru>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Alexey Dobriyan 2008-04-29 01:01:54 -07:00 committed by Linus Torvalds
parent 3ae02d6bc1
commit 076ec04b8a
1 changed files with 20 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
drivers/nubus/proc.c
View file

@ -21,6 +21,7 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/nubus.h> #include <linux/nubus.h>
#include <linux/proc_fs.h> #include <linux/proc_fs.h>
#include <linux/seq_file.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/module.h> #include <linux/module.h>
@ -28,38 +29,36 @@
#include <asm/byteorder.h> #include <asm/byteorder.h>
static int static int
get_nubus_dev_info(char *buf, char **start, off_t pos, int count) nubus_devices_proc_show(struct seq_file *m, void *v)
{ {
struct nubus_dev *dev = nubus_devices; struct nubus_dev *dev = nubus_devices;
off_t at = 0;
int len, cnt;
cnt = 0; while (dev) {
while (dev && count > cnt) { seq_printf(m, "%x\t%04x %04x %04x %04x",
len = sprintf(buf, "%x\t%04x %04x %04x %04x",
dev->board->slot, dev->board->slot,
dev->category, dev->category,
dev->type, dev->type,
dev->dr_sw, dev->dr_sw,
dev->dr_hw); dev->dr_hw);
len += sprintf(buf+len, seq_printf(m, "\t%08lx\n", dev->board->slot_addr);
"\t%08lx",
dev->board->slot_addr);
buf[len++] = '\n';
at += len;
if (at >= pos) {
if (!*start) {
*start = buf + (pos - (at - len));
cnt = at - pos;
} else
cnt += len;
buf += len;
}
dev = dev->next; dev = dev->next;
} }
return (count > cnt) ? cnt : count; return 0;
} }
static int nubus_devices_proc_open(struct inode *inode, struct file *file)
{
return single_open(file, nubus_devices_proc_show, NULL);
}
static const struct file_operations nubus_devices_proc_fops = {
.owner = THIS_MODULE,
.open = nubus_devices_proc_open,
.read = seq_read,
.llseek = seq_lseek,
.release = single_release,
};
static struct proc_dir_entry *proc_bus_nubus_dir; static struct proc_dir_entry *proc_bus_nubus_dir;
static void nubus_proc_subdir(struct nubus_dev* dev, static void nubus_proc_subdir(struct nubus_dev* dev,
@ -172,7 +171,6 @@ void __init nubus_proc_init(void)
if (!MACH_IS_MAC) if (!MACH_IS_MAC)
return; return;
proc_bus_nubus_dir = proc_mkdir("bus/nubus", NULL); proc_bus_nubus_dir = proc_mkdir("bus/nubus", NULL);
create_proc_info_entry("devices", 0, proc_bus_nubus_dir, proc_create("devices", 0, proc_bus_nubus_dir, &nubus_devices_proc_fops);
get_nubus_dev_info);
proc_bus_nubus_add_devices(); proc_bus_nubus_add_devices();
} }