[v2 010/115] sysctl: remove .child from dev/hpet/
From: Lucian Adrian Grijincu <hidden>
Date: 2011-05-08 23:05:19
Also in:
lkml
Subsystem:
char and misc drivers, hpet: high precision event timers driver, the rest · Maintainers:
Arnd Bergmann, Greg Kroah-Hartman, Clemens Ladisch, Linus Torvalds
Signed-off-by: Lucian Adrian Grijincu <redacted> --- drivers/char/hpet.c | 38 ++++++++++++-------------------------- 1 files changed, 12 insertions(+), 26 deletions(-)
diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c
index 7066e80..303de7e 100644
--- a/drivers/char/hpet.c
+++ b/drivers/char/hpet.c@@ -721,33 +721,19 @@ static int hpet_is_known(struct hpet_data *hdp) static ctl_table hpet_table[] = { { - .procname = "max-user-freq", - .data = &hpet_max_freq, - .maxlen = sizeof(int), - .mode = 0644, - .proc_handler = proc_dointvec, - }, - {} + .procname = "max-user-freq", + .data = &hpet_max_freq, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = proc_dointvec, + }, + { } }; -static ctl_table hpet_root[] = { - { - .procname = "hpet", - .maxlen = 0, - .mode = 0555, - .child = hpet_table, - }, - {} -}; - -static ctl_table dev_root[] = { - { - .procname = "dev", - .maxlen = 0, - .mode = 0555, - .child = hpet_root, - }, - {} +static const struct ctl_path hpet_path[] = { + { .procname = "dev" }, + { .procname = "hpet" }, + { } }; static struct ctl_table_header *sysctl_header;
@@ -1053,7 +1039,7 @@ static int __init hpet_init(void) if (result < 0) return -ENODEV; - sysctl_header = register_sysctl_table(dev_root); + sysctl_header = register_sysctl_paths(hpet_path, hpet_table); result = acpi_bus_register_driver(&hpet_acpi_driver); if (result < 0) {
--
1.7.5.134.g1c08b