Commit c62432b4 authored by Al Viro's avatar Al Viro

[mips] switch pvc_proc_cleanup() to remove_proc_subtree()

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent b25472f9
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
static DEFINE_MUTEX(pvc_mutex); static DEFINE_MUTEX(pvc_mutex);
static char pvc_lines[PVC_NLINES][PVC_LINELEN+1]; static char pvc_lines[PVC_NLINES][PVC_LINELEN+1];
static int pvc_linedata[PVC_NLINES]; static int pvc_linedata[PVC_NLINES];
static struct proc_dir_entry *pvc_display_dir;
static char *pvc_linename[PVC_NLINES] = {"line1", "line2"}; static char *pvc_linename[PVC_NLINES] = {"line1", "line2"};
#define DISPLAY_DIR_NAME "display" #define DISPLAY_DIR_NAME "display"
static int scroll_dir, scroll_interval; static int scroll_dir, scroll_interval;
...@@ -169,22 +168,17 @@ void pvc_proc_timerfunc(unsigned long data) ...@@ -169,22 +168,17 @@ void pvc_proc_timerfunc(unsigned long data)
static void pvc_proc_cleanup(void) static void pvc_proc_cleanup(void)
{ {
int i; remove_proc_subtree(DISPLAY_DIR_NAME, NULL);
for (i = 0; i < PVC_NLINES; i++)
remove_proc_entry(pvc_linename[i], pvc_display_dir);
remove_proc_entry("scroll", pvc_display_dir);
remove_proc_entry(DISPLAY_DIR_NAME, NULL);
del_timer_sync(&timer); del_timer_sync(&timer);
} }
static int __init pvc_proc_init(void) static int __init pvc_proc_init(void)
{ {
struct proc_dir_entry *proc_entry; struct proc_dir_entry *dir, *proc_entry;
int i; int i;
pvc_display_dir = proc_mkdir(DISPLAY_DIR_NAME, NULL); dir = proc_mkdir(DISPLAY_DIR_NAME, NULL);
if (pvc_display_dir == NULL) if (dir == NULL)
goto error; goto error;
for (i = 0; i < PVC_NLINES; i++) { for (i = 0; i < PVC_NLINES; i++) {
...@@ -192,12 +186,12 @@ static int __init pvc_proc_init(void) ...@@ -192,12 +186,12 @@ static int __init pvc_proc_init(void)
pvc_linedata[i] = i; pvc_linedata[i] = i;
} }
for (i = 0; i < PVC_NLINES; i++) { for (i = 0; i < PVC_NLINES; i++) {
proc_entry = proc_create_data(pvc_linename[i], 0644, pvc_display_dir, proc_entry = proc_create_data(pvc_linename[i], 0644, dir,
&pvc_line_proc_fops, &pvc_linedata[i]); &pvc_line_proc_fops, &pvc_linedata[i]);
if (proc_entry == NULL) if (proc_entry == NULL)
goto error; goto error;
} }
proc_entry = proc_create("scroll", 0644, pvc_display_dir, proc_entry = proc_create("scroll", 0644, dir,
&pvc_scroll_proc_fops); &pvc_scroll_proc_fops);
if (proc_entry == NULL) if (proc_entry == NULL)
goto error; goto error;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment