10 files changed, 14 insertions, 17 deletions

diff --git a/arch/arm/kernel/ecard.c b/arch/arm/kernel/ecard.c
index f56d48c451ea..2d8ab6b3a586 100644
--- a/arch/arm/kernel/ecard.c
+++ b/arch/arm/kernel/ecard.c
@@ -778,7 +778,7 @@ static struct proc_dir_entry *proc_bus_ecard_dir = NULL;
 
 static void ecard_proc_init(void)
 {
-        proc_bus_ecard_dir = proc_mkdir("ecard", proc_bus);
+        proc_bus_ecard_dir = proc_mkdir("bus/ecard", NULL);
         create_proc_info_entry("devices", 0, proc_bus_ecard_dir,
                 get_ecard_dev_info);
 }
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)
 {
         struct proc_dir_entry *entry;
 
-        proc_bus_input_dir = proc_mkdir("input", proc_bus);
+        proc_bus_input_dir = proc_mkdir("bus/input", NULL);
         if (!proc_bus_input_dir)
                 return -ENOMEM;
 
@@ -921,7 +921,7 @@ static int __init input_proc_init(void)
         return 0;
 
  fail2: remove_proc_entry("devices", proc_bus_input_dir);
- fail1: remove_proc_entry("input", proc_bus);
+ fail1: remove_proc_entry("bus/input", NULL);
         return -ENOMEM;
 }
 
@@ -929,7 +929,7 @@ static void input_proc_exit(void)
 {
         remove_proc_entry("devices", proc_bus_input_dir);
         remove_proc_entry("handlers", proc_bus_input_dir);
-        remove_proc_entry("input", proc_bus);
+        remove_proc_entry("bus/input", NULL);
 }
 
 #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)
 {
         if (!MACH_IS_MAC)
                 return;
-        proc_bus_nubus_dir = proc_mkdir("nubus", proc_bus);
+        proc_bus_nubus_dir = proc_mkdir("bus/nubus", NULL);
         create_proc_info_entry("devices", 0, proc_bus_nubus_dir,
                                 get_nubus_dev_info);
         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)
 {
         struct proc_dir_entry *entry;
         struct pci_dev *dev = NULL;
-        proc_bus_pci_dir = proc_mkdir("pci", proc_bus);
+        proc_bus_pci_dir = proc_mkdir("bus/pci", NULL);
         entry = create_proc_entry("devices", 0, proc_bus_pci_dir);
         if (entry)
                 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)
 {
         struct pnp_dev *dev;
 
-        isapnp_proc_bus_dir = proc_mkdir("isapnp", proc_bus);
+        isapnp_proc_bus_dir = proc_mkdir("bus/isapnp", NULL);
         protocol_for_each_dev(&isapnp_protocol, dev) {
                 isapnp_proc_attach_device(dev);
         }
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)
  */
 int __init pnpbios_proc_init(void)
 {
-        proc_pnp = proc_mkdir("pnp", proc_bus);
+        proc_pnp = proc_mkdir("bus/pnp", NULL);
         if (!proc_pnp)
                 return -EIO;
         proc_pnp_boot = proc_mkdir("boot", proc_pnp);
@@ -294,5 +294,5 @@ void __exit pnpbios_proc_exit(void)
         remove_proc_entry("configuration_info", proc_pnp);
         remove_proc_entry("devices", proc_pnp);
         remove_proc_entry("boot", proc_pnp);
-        remove_proc_entry("pnp", proc_bus);
+        remove_proc_entry("bus/pnp", NULL);
 }
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)
         usb_register_notify(&usbfs_nb);
 
         /* create mount point for usbfs */
-        usbdir = proc_mkdir("usb", proc_bus);
+        usbdir = proc_mkdir("bus/usb", NULL);
 
         return 0;
 }
@@ -783,6 +783,6 @@ void usbfs_cleanup(void)
         usb_unregister_notify(&usbfs_nb);
         unregister_filesystem(&usb_fs_type);
         if (usbdir)
-                remove_proc_entry("usb", proc_bus);
+                remove_proc_entry("bus/usb", NULL);
 }
 
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)
         u_int slot;
 
         if (MACH_IS_AMIGA && AMIGAHW_PRESENT(ZORRO)) {
-                proc_bus_zorro_dir = proc_mkdir("zorro", proc_bus);
+                proc_bus_zorro_dir = proc_mkdir("bus/zorro", NULL);
                 create_proc_info_entry("devices", 0, proc_bus_zorro_dir,
                                        get_zorro_dev_info);
                 for (slot = 0; slot < zorro_num_autocon; slot++)
diff --git a/fs/proc/root.c b/fs/proc/root.c
index ef0fb57fc9ef..cc46fcba8029 100644
--- a/fs/proc/root.c
+++ b/fs/proc/root.c
@@ -22,7 +22,7 @@
 
 #include "internal.h"
 
-struct proc_dir_entry *proc_bus, *proc_root_fs, *proc_root_driver;
+struct proc_dir_entry *proc_root_fs, *proc_root_driver;
 
 static int proc_test_super(struct super_block *sb, void *data)
 {
@@ -137,7 +137,7 @@ void __init proc_root_init(void)
 #ifdef CONFIG_PROC_DEVICETREE
         proc_device_tree_init();
 #endif
-        proc_bus = proc_mkdir("bus", NULL);
+        proc_mkdir("bus", NULL);
         proc_sys_init();
 }
 
@@ -236,5 +236,4 @@ EXPORT_SYMBOL(proc_create);
 EXPORT_SYMBOL(remove_proc_entry);
 EXPORT_SYMBOL(proc_root);
 EXPORT_SYMBOL(proc_root_fs);
-EXPORT_SYMBOL(proc_bus);
 EXPORT_SYMBOL(proc_root_driver);
diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h
index 65f2299b772b..78c8c41ea9cc 100644
--- a/include/linux/proc_fs.h
+++ b/include/linux/proc_fs.h
@@ -98,7 +98,6 @@ struct vmcore {
 
 extern struct proc_dir_entry proc_root;
 extern struct proc_dir_entry *proc_root_fs;
-extern struct proc_dir_entry *proc_bus;
 extern struct proc_dir_entry *proc_root_driver;
 extern struct proc_dir_entry *proc_root_kcore;
 
@@ -214,7 +213,6 @@ extern void dup_mm_exe_file(struct mm_struct *oldmm, struct mm_struct *newmm);
 #else
 
 #define proc_root_driver NULL
-#define proc_bus NULL
 
 #define proc_net_fops_create(net, name, mode, fops)  ({ (void)(mode), NULL; })
 static inline void proc_net_remove(struct net *net, const char *name) {}