aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAlexey Dobriyan <adobriyan@gmail.com>2008-04-29 04:01:41 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-29 11:06:18 -0400
commit9c37066d888bf6e1b96ad12304971b3ddeabbad0 (patch)
tree87f39924be4d36b25918cf7a90eb0db7743cba99 /drivers
parent5e971dce0b2f6896e02372512df0d1fb0bfe2d55 (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')
-rw-r--r--drivers/input/input.c6
-rw-r--r--drivers/nubus/proc.c2
-rw-r--r--drivers/pci/proc.c2
-rw-r--r--drivers/pnp/isapnp/proc.c2
-rw-r--r--drivers/pnp/pnpbios/proc.c4
-rw-r--r--drivers/usb/core/inode.c4
-rw-r--r--drivers/zorro/proc.c2
7 files changed, 11 insertions, 11 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 */
diff --git a/drivers/nubus/proc.c b/drivers/nubus/proc.c
index e07492be1f4a..cb83acef9479 100644
--- a/drivers/nubus/proc.c
+++ b/drivers/nubus/proc.c
@@ -171,7 +171,7 @@ void __init nubus_proc_init(void)
171{ 171{
172 if (!MACH_IS_MAC) 172 if (!MACH_IS_MAC)
173 return; 173 return;
174 proc_bus_nubus_dir = proc_mkdir("nubus", proc_bus); 174 proc_bus_nubus_dir = proc_mkdir("bus/nubus", NULL);
175 create_proc_info_entry("devices", 0, proc_bus_nubus_dir, 175 create_proc_info_entry("devices", 0, proc_bus_nubus_dir,
176 get_nubus_dev_info); 176 get_nubus_dev_info);
177 proc_bus_nubus_add_devices(); 177 proc_bus_nubus_add_devices();
diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c
index ef18fcd641e2..7b5e45b2fd16 100644
--- a/drivers/pci/proc.c
+++ b/drivers/pci/proc.c
@@ -472,7 +472,7 @@ static int __init pci_proc_init(void)
472{ 472{
473 struct proc_dir_entry *entry; 473 struct proc_dir_entry *entry;
474 struct pci_dev *dev = NULL; 474 struct pci_dev *dev = NULL;
475 proc_bus_pci_dir = proc_mkdir("pci", proc_bus); 475 proc_bus_pci_dir = proc_mkdir("bus/pci", NULL);
476 entry = create_proc_entry("devices", 0, proc_bus_pci_dir); 476 entry = create_proc_entry("devices", 0, proc_bus_pci_dir);
477 if (entry) 477 if (entry)
478 entry->proc_fops = &proc_bus_pci_dev_operations; 478 entry->proc_fops = &proc_bus_pci_dev_operations;
diff --git a/drivers/pnp/isapnp/proc.c b/drivers/pnp/isapnp/proc.c
index 2b8266c3d40f..e1d1f2a10947 100644
--- a/drivers/pnp/isapnp/proc.c
+++ b/drivers/pnp/isapnp/proc.c
@@ -116,7 +116,7 @@ int __init isapnp_proc_init(void)
116{ 116{
117 struct pnp_dev *dev; 117 struct pnp_dev *dev;
118 118
119 isapnp_proc_bus_dir = proc_mkdir("isapnp", proc_bus); 119 isapnp_proc_bus_dir = proc_mkdir("bus/isapnp", NULL);
120 protocol_for_each_dev(&isapnp_protocol, dev) { 120 protocol_for_each_dev(&isapnp_protocol, dev) {
121 isapnp_proc_attach_device(dev); 121 isapnp_proc_attach_device(dev);
122 } 122 }
diff --git a/drivers/pnp/pnpbios/proc.c b/drivers/pnp/pnpbios/proc.c
index bb19bc957bad..46d506f66259 100644
--- a/drivers/pnp/pnpbios/proc.c
+++ b/drivers/pnp/pnpbios/proc.c
@@ -256,7 +256,7 @@ int pnpbios_interface_attach_device(struct pnp_bios_node *node)
256 */ 256 */
257int __init pnpbios_proc_init(void) 257int __init pnpbios_proc_init(void)
258{ 258{
259 proc_pnp = proc_mkdir("pnp", proc_bus); 259 proc_pnp = proc_mkdir("bus/pnp", NULL);
260 if (!proc_pnp) 260 if (!proc_pnp)
261 return -EIO; 261 return -EIO;
262 proc_pnp_boot = proc_mkdir("boot", proc_pnp); 262 proc_pnp_boot = proc_mkdir("boot", proc_pnp);
@@ -294,5 +294,5 @@ void __exit pnpbios_proc_exit(void)
294 remove_proc_entry("configuration_info", proc_pnp); 294 remove_proc_entry("configuration_info", proc_pnp);
295 remove_proc_entry("devices", proc_pnp); 295 remove_proc_entry("devices", proc_pnp);
296 remove_proc_entry("boot", proc_pnp); 296 remove_proc_entry("boot", proc_pnp);
297 remove_proc_entry("pnp", proc_bus); 297 remove_proc_entry("bus/pnp", NULL);
298} 298}
diff --git a/drivers/usb/core/inode.c b/drivers/usb/core/inode.c
index 8607846e3c3f..1d253dd4ea81 100644
--- a/drivers/usb/core/inode.c
+++ b/drivers/usb/core/inode.c
@@ -773,7 +773,7 @@ int __init usbfs_init(void)
773 usb_register_notify(&usbfs_nb); 773 usb_register_notify(&usbfs_nb);
774 774
775 /* create mount point for usbfs */ 775 /* create mount point for usbfs */
776 usbdir = proc_mkdir("usb", proc_bus); 776 usbdir = proc_mkdir("bus/usb", NULL);
777 777
778 return 0; 778 return 0;
779} 779}
@@ -783,6 +783,6 @@ void usbfs_cleanup(void)
783 usb_unregister_notify(&usbfs_nb); 783 usb_unregister_notify(&usbfs_nb);
784 unregister_filesystem(&usb_fs_type); 784 unregister_filesystem(&usb_fs_type);
785 if (usbdir) 785 if (usbdir)
786 remove_proc_entry("usb", proc_bus); 786 remove_proc_entry("bus/usb", NULL);
787} 787}
788 788
diff --git a/drivers/zorro/proc.c b/drivers/zorro/proc.c
index 2ce4cebc31d9..b7a8c7b7f66e 100644
--- a/drivers/zorro/proc.c
+++ b/drivers/zorro/proc.c
@@ -128,7 +128,7 @@ static int __init zorro_proc_init(void)
128 u_int slot; 128 u_int slot;
129 129
130 if (MACH_IS_AMIGA && AMIGAHW_PRESENT(ZORRO)) { 130 if (MACH_IS_AMIGA && AMIGAHW_PRESENT(ZORRO)) {
131 proc_bus_zorro_dir = proc_mkdir("zorro", proc_bus); 131 proc_bus_zorro_dir = proc_mkdir("bus/zorro", NULL);
132 create_proc_info_entry("devices", 0, proc_bus_zorro_dir, 132 create_proc_info_entry("devices", 0, proc_bus_zorro_dir,
133 get_zorro_dev_info); 133 get_zorro_dev_info);
134 for (slot = 0; slot < zorro_num_autocon; slot++) 134 for (slot = 0; slot < zorro_num_autocon; slot++)