hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

srm_env: use proc_remove_subtree() 

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2013-03-31 18:29:51 -04:00
parent d9dda78bad
commit c35f2e49f8
1 changed files with 7 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
arch/alpha/kernel/srm_env.c
View File

@ -51,7 +51,6 @@ MODULE_LICENSE("GPL");
typedef struct _srm_env { typedef struct _srm_env {
char *name; char *name;
unsigned long id; unsigned long id;
struct proc_dir_entry *proc_entry;
} srm_env_t; } srm_env_t;
static struct proc_dir_entry *base_dir; static struct proc_dir_entry *base_dir;
@ -149,52 +148,6 @@ static const struct file_operations srm_env_proc_fops = {
.write = srm_env_proc_write, .write = srm_env_proc_write,
}; };
static void
srm_env_cleanup(void)
{
srm_env_t *entry;
unsigned long var_num;
if (base_dir) {
/*
* Remove named entries
*/
if (named_dir) {
entry = srm_named_entries;
while (entry->name != NULL && entry->id != 0) {
if (entry->proc_entry) {
remove_proc_entry(entry->name,
named_dir);
entry->proc_entry = NULL;
}
entry++;
}
remove_proc_entry(NAMED_DIR, base_dir);
}
/*
* Remove numbered entries
*/
if (numbered_dir) {
for (var_num = 0; var_num <= 255; var_num++) {
entry = &srm_numbered_entries[var_num];
if (entry->proc_entry) {
remove_proc_entry(entry->name,
numbered_dir);
entry->proc_entry = NULL;
entry->name = NULL;
}
}
remove_proc_entry(NUMBERED_DIR, base_dir);
}
remove_proc_entry(BASE_DIR, NULL);
}
return;
}
static int __init static int __init
srm_env_init(void) srm_env_init(void)
{ {
@ -225,7 +178,7 @@ srm_env_init(void)
if (!base_dir) { if (!base_dir) {
printk(KERN_ERR "Couldn't create base dir /proc/%s\n", printk(KERN_ERR "Couldn't create base dir /proc/%s\n",
BASE_DIR); BASE_DIR);
goto cleanup; return -ENOMEM;
} }
/* /*
@ -254,9 +207,8 @@ srm_env_init(void)
*/ */
entry = srm_named_entries; entry = srm_named_entries;
while (entry->name && entry->id) { while (entry->name && entry->id) {
entry->proc_entry = proc_create_data(entry->name, 0644, named_dir, if (!proc_create_data(entry->name, 0644, named_dir,
&srm_env_proc_fops, entry); &srm_env_proc_fops, entry))
if (!entry->proc_entry)
goto cleanup; goto cleanup;
entry++; entry++;
} }
@ -268,9 +220,8 @@ srm_env_init(void)
entry = &srm_numbered_entries[var_num]; entry = &srm_numbered_entries[var_num];
entry->name = number[var_num]; entry->name = number[var_num];
entry->proc_entry = proc_create_data(entry->name, 0644, numbered_dir, if (!proc_create_data(entry->name, 0644, numbered_dir,
&srm_env_proc_fops, entry); &srm_env_proc_fops, entry))
if (!entry->proc_entry)
goto cleanup; goto cleanup;
entry->id = var_num; entry->id = var_num;
@ -282,15 +233,14 @@ srm_env_init(void)
return 0; return 0;
cleanup: cleanup:
srm_env_cleanup(); remove_proc_subtree(BASE_DIR, NULL);
return -ENOMEM; return -ENOMEM;
} }
static void __exit static void __exit
srm_env_exit(void) srm_env_exit(void)
{ {
srm_env_cleanup(); remove_proc_subtree(BASE_DIR, NULL);
printk(KERN_INFO "%s: unloaded successfully\n", NAME); printk(KERN_INFO "%s: unloaded successfully\n", NAME);
return; return;