Commit dfd007a667982372bfb05583c17bf5d4124c3c50
Committed by
Linus Torvalds
1 parent
c8d1a1ac16
[PATCH] sysctl: C99 convert arch/frv/kernel/pm.c
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> Acked-by: David Howells <dhowells@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Showing 1 changed file with 43 additions and 7 deletions Side-by-side Diff
arch/frv/kernel/pm.c
... | ... | @@ -401,17 +401,53 @@ |
401 | 401 | |
402 | 402 | static struct ctl_table pm_table[] = |
403 | 403 | { |
404 | - {CTL_PM_SUSPEND, "suspend", NULL, 0, 0200, NULL, &sysctl_pm_do_suspend}, | |
405 | - {CTL_PM_CMODE, "cmode", &clock_cmode_current, sizeof(int), 0644, NULL, &cmode_procctl, &cmode_sysctl, NULL}, | |
406 | - {CTL_PM_P0, "p0", &clock_p0_current, sizeof(int), 0644, NULL, &p0_procctl, &p0_sysctl, NULL}, | |
407 | - {CTL_PM_CM, "cm", &clock_cm_current, sizeof(int), 0644, NULL, &cm_procctl, &cm_sysctl, NULL}, | |
408 | - {0} | |
404 | + { | |
405 | + .ctl_name = CTL_PM_SUSPEND, | |
406 | + .procname = "suspend", | |
407 | + .data = NULL, | |
408 | + .maxlen = 0, | |
409 | + .mode = 0200, | |
410 | + .proc_handler = &sysctl_pm_do_suspend, | |
411 | + }, | |
412 | + { | |
413 | + .ctl_name = CTL_PM_CMODE, | |
414 | + .procname = "cmode", | |
415 | + .data = &clock_cmode_current, | |
416 | + .maxlen = sizeof(int), | |
417 | + .mode = 0644, | |
418 | + .proc_handler = &cmode_procctl, | |
419 | + .strategy = &cmode_sysctl, | |
420 | + }, | |
421 | + { | |
422 | + .ctl_name = CTL_PM_P0, | |
423 | + .procname = "p0", | |
424 | + .data = &clock_p0_current, | |
425 | + .maxlen = sizeof(int), | |
426 | + .mode = 0644, | |
427 | + .proc_handler = &p0_procctl, | |
428 | + .strategy = &p0_sysctl, | |
429 | + }, | |
430 | + { | |
431 | + .ctl_name = CTL_PM_CM, | |
432 | + .procname = "cm", | |
433 | + .data = &clock_cm_current, | |
434 | + .maxlen = sizeof(int), | |
435 | + .mode = 0644, | |
436 | + .proc_handler = &cm_procctl, | |
437 | + .strategy = &cm_sysctl, | |
438 | + }, | |
439 | + { .ctl_name = 0} | |
409 | 440 | }; |
410 | 441 | |
411 | 442 | static struct ctl_table pm_dir_table[] = |
412 | 443 | { |
413 | - {CTL_PM, "pm", NULL, 0, 0555, pm_table}, | |
414 | - {0} | |
444 | + { | |
445 | + .ctl_name = CTL_PM, | |
446 | + .procname = "pm", | |
447 | + .mode = 0555, | |
448 | + .child = pm_table, | |
449 | + }, | |
450 | + { .ctl_name = 0} | |
415 | 451 | }; |
416 | 452 | |
417 | 453 | /* |