提交 51251549 编写于 作者: A Alexey Dobriyan 提交者: Linus Torvalds

proc: remove /proc/mac_iop

Entry creation was commented for a long time and right now it stands on
the way of ->get_info removal, so unless nobody objects...
Signed-off-by: NAlexey Dobriyan <adobriyan@sw.ru>
Cc: Simon Arlott <simon@fire.lp0.eu>
Cc: Roman Zippel <zippel@linux-m68k.org>
Cc: Joern Engel <joern@wohnheim.fh-wedel.de>
Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
上级 647634df
...@@ -109,7 +109,6 @@ ...@@ -109,7 +109,6 @@
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/proc_fs.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <asm/bootinfo.h> #include <asm/bootinfo.h>
...@@ -124,10 +123,6 @@ ...@@ -124,10 +123,6 @@
int iop_scc_present,iop_ism_present; int iop_scc_present,iop_ism_present;
#ifdef CONFIG_PROC_FS
static int iop_get_proc_info(char *, char **, off_t, int);
#endif /* CONFIG_PROC_FS */
/* structure for tracking channel listeners */ /* structure for tracking channel listeners */
struct listener { struct listener {
...@@ -299,12 +294,6 @@ void __init iop_init(void) ...@@ -299,12 +294,6 @@ void __init iop_init(void)
iop_listeners[IOP_NUM_ISM][i].devname = NULL; iop_listeners[IOP_NUM_ISM][i].devname = NULL;
iop_listeners[IOP_NUM_ISM][i].handler = NULL; iop_listeners[IOP_NUM_ISM][i].handler = NULL;
} }
#if 0 /* Crashing in 2.4 now, not yet sure why. --jmt */
#ifdef CONFIG_PROC_FS
create_proc_info_entry("mac_iop", 0, NULL, iop_get_proc_info);
#endif
#endif
} }
/* /*
...@@ -637,77 +626,3 @@ irqreturn_t iop_ism_irq(int irq, void *dev_id) ...@@ -637,77 +626,3 @@ irqreturn_t iop_ism_irq(int irq, void *dev_id)
} }
return IRQ_HANDLED; return IRQ_HANDLED;
} }
#ifdef CONFIG_PROC_FS
char *iop_chan_state(int state)
{
switch(state) {
case IOP_MSG_IDLE : return "idle ";
case IOP_MSG_NEW : return "new ";
case IOP_MSG_RCVD : return "received ";
case IOP_MSG_COMPLETE : return "completed ";
default : return "unknown ";
}
}
int iop_dump_one_iop(char *buf, int iop_num, char *iop_name)
{
int i,len = 0;
volatile struct mac_iop *iop = iop_base[iop_num];
len += sprintf(buf+len, "%s IOP channel states:\n\n", iop_name);
len += sprintf(buf+len, "## send_state recv_state device\n");
len += sprintf(buf+len, "------------------------------------------------\n");
for (i = 0 ; i < NUM_IOP_CHAN ; i++) {
len += sprintf(buf+len, "%2d %10s %10s %s\n", i,
iop_chan_state(iop_readb(iop, IOP_ADDR_SEND_STATE+i)),
iop_chan_state(iop_readb(iop, IOP_ADDR_RECV_STATE+i)),
iop_listeners[iop_num][i].handler?
iop_listeners[iop_num][i].devname : "");
}
len += sprintf(buf+len, "\n");
return len;
}
static int iop_get_proc_info(char *buf, char **start, off_t pos, int count)
{
int len, cnt;
cnt = 0;
len = sprintf(buf, "IOPs detected:\n\n");
if (iop_scc_present) {
len += sprintf(buf+len, "SCC IOP (%p): status %02X\n",
iop_base[IOP_NUM_SCC],
(uint) iop_base[IOP_NUM_SCC]->status_ctrl);
}
if (iop_ism_present) {
len += sprintf(buf+len, "ISM IOP (%p): status %02X\n\n",
iop_base[IOP_NUM_ISM],
(uint) iop_base[IOP_NUM_ISM]->status_ctrl);
}
if (iop_scc_present) {
len += iop_dump_one_iop(buf+len, IOP_NUM_SCC, "SCC");
}
if (iop_ism_present) {
len += iop_dump_one_iop(buf+len, IOP_NUM_ISM, "ISM");
}
if (len >= pos) {
if (!*start) {
*start = buf + pos;
cnt = len - pos;
} else {
cnt += len;
}
}
return (count > cnt) ? cnt : count;
}
#endif /* CONFIG_PROC_FS */
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册