[v2 011/115] sysctl: remove .child from dev/ipmi/
From: Lucian Adrian Grijincu <hidden>
Date: 2011-05-08 23:04:27
Also in:
lkml
Subsystem:
ipmi subsystem, the rest · Maintainers:
Corey Minyard, Linus Torvalds
Signed-off-by: Lucian Adrian Grijincu <redacted> --- drivers/char/ipmi/ipmi_poweroff.c | 16 ++++------------ 1 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/drivers/char/ipmi/ipmi_poweroff.c b/drivers/char/ipmi/ipmi_poweroff.c
index 2efa176..ac71d69 100644
--- a/drivers/char/ipmi/ipmi_poweroff.c
+++ b/drivers/char/ipmi/ipmi_poweroff.c@@ -668,17 +668,9 @@ static ctl_table ipmi_table[] = { { } }; -static ctl_table ipmi_dir_table[] = { - { .procname = "ipmi", - .mode = 0555, - .child = ipmi_table }, - { } -}; - -static ctl_table ipmi_root_table[] = { - { .procname = "dev", - .mode = 0555, - .child = ipmi_dir_table }, +static const struct ctl_path ipmi_path[] = { + { .procname = "dev" }, + { .procname = "ipmi" }, { } };
@@ -699,7 +691,7 @@ static int __init ipmi_poweroff_init(void) printk(KERN_INFO PFX "Power cycle is enabled.\n"); #ifdef CONFIG_PROC_FS - ipmi_table_header = register_sysctl_table(ipmi_root_table); + ipmi_table_header = register_sysctl_paths(ipmi_path, ipmi_table); if (!ipmi_table_header) { printk(KERN_ERR PFX "Unable to register powercycle sysctl\n"); rv = -ENOMEM;
--
1.7.5.134.g1c08b