diff options
author | Alexey Dobriyan <adobriyan@gmail.com> | 2008-04-29 04:01:41 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-29 11:06:18 -0400 |
commit | 9c37066d888bf6e1b96ad12304971b3ddeabbad0 (patch) | |
tree | 87f39924be4d36b25918cf7a90eb0db7743cba99 /drivers/input/input.c | |
parent | 5e971dce0b2f6896e02372512df0d1fb0bfe2d55 (diff) |
proc: remove proc_bus
Remove proc_bus export and variable itself. Using pathnames works fine
and is slightly more understandable and greppable.
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/input/input.c')
-rw-r--r-- | drivers/input/input.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/input/input.c b/drivers/input/input.c index f02c242c3114..11426604d8a2 100644 --- a/drivers/input/input.c +++ b/drivers/input/input.c | |||
@@ -898,7 +898,7 @@ static int __init input_proc_init(void) | |||
898 | { | 898 | { |
899 | struct proc_dir_entry *entry; | 899 | struct proc_dir_entry *entry; |
900 | 900 | ||
901 | proc_bus_input_dir = proc_mkdir("input", proc_bus); | 901 | proc_bus_input_dir = proc_mkdir("bus/input", NULL); |
902 | if (!proc_bus_input_dir) | 902 | if (!proc_bus_input_dir) |
903 | return -ENOMEM; | 903 | return -ENOMEM; |
904 | 904 | ||
@@ -921,7 +921,7 @@ static int __init input_proc_init(void) | |||
921 | return 0; | 921 | return 0; |
922 | 922 | ||
923 | fail2: remove_proc_entry("devices", proc_bus_input_dir); | 923 | fail2: remove_proc_entry("devices", proc_bus_input_dir); |
924 | fail1: remove_proc_entry("input", proc_bus); | 924 | fail1: remove_proc_entry("bus/input", NULL); |
925 | return -ENOMEM; | 925 | return -ENOMEM; |
926 | } | 926 | } |
927 | 927 | ||
@@ -929,7 +929,7 @@ static void input_proc_exit(void) | |||
929 | { | 929 | { |
930 | remove_proc_entry("devices", proc_bus_input_dir); | 930 | remove_proc_entry("devices", proc_bus_input_dir); |
931 | remove_proc_entry("handlers", proc_bus_input_dir); | 931 | remove_proc_entry("handlers", proc_bus_input_dir); |
932 | remove_proc_entry("input", proc_bus); | 932 | remove_proc_entry("bus/input", NULL); |
933 | } | 933 | } |
934 | 934 | ||
935 | #else /* !CONFIG_PROC_FS */ | 935 | #else /* !CONFIG_PROC_FS */ |