proc: remove proc_root_driver

Use creation by full path: "driver/foo".

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>

6 files changed, 11 insertions, 17 deletions

diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index cf6083a1f928..e539be5750dc 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -425,7 +425,7 @@ static void __devinit cciss_procinit(int i)
         struct proc_dir_entry *pde;
 
         if (proc_cciss == NULL)
-                proc_cciss = proc_mkdir("cciss", proc_root_driver);
+                proc_cciss = proc_mkdir("driver/cciss", NULL);
         if (!proc_cciss)
                 return;
         pde = proc_create(hba[i]->devname, S_IWUSR | S_IRUSR | S_IRGRP |
@@ -3700,7 +3700,7 @@ static void __exit cciss_cleanup(void)
                         cciss_remove_one(hba[i]->pdev);
                 }
         }
-        remove_proc_entry("cciss", proc_root_driver);
+        remove_proc_entry("driver/cciss", NULL);
 }
 
 static void fail_all_cmds(unsigned long ctlr)
diff --git a/drivers/block/cpqarray.c b/drivers/block/cpqarray.c
index 69199185ff4b..09c14341e6e3 100644
--- a/drivers/block/cpqarray.c
+++ b/drivers/block/cpqarray.c
@@ -214,7 +214,7 @@ static struct proc_dir_entry *proc_array;
 static void __init ida_procinit(int i)
 {
         if (proc_array == NULL) {
-                proc_array = proc_mkdir("cpqarray", proc_root_driver);
+                proc_array = proc_mkdir("driver/cpqarray", NULL);
                 if (!proc_array) return;
         }
 
@@ -1796,7 +1796,7 @@ static void __exit cpqarray_exit(void)
                 }
         }
 
-        remove_proc_entry("cpqarray", proc_root_driver);
+        remove_proc_entry("driver/cpqarray", NULL);
 }
 
 module_init(cpqarray_init)
diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
index 18feb1c7c33b..0431e5977bcb 100644
--- a/drivers/block/pktcdvd.c
+++ b/drivers/block/pktcdvd.c
@@ -3101,7 +3101,7 @@ static int __init pkt_init(void)
                 goto out_misc;
         }
 
-        pkt_proc = proc_mkdir(DRIVER_NAME, proc_root_driver);
+        pkt_proc = proc_mkdir("driver/"DRIVER_NAME, NULL);
 
         return 0;
 
@@ -3117,7 +3117,7 @@ out2:
 
 static void __exit pkt_exit(void)
 {
-        remove_proc_entry(DRIVER_NAME, proc_root_driver);
+        remove_proc_entry("driver/"DRIVER_NAME, NULL);
         misc_deregister(&pkt_misc);
 
         pkt_debugfs_cleanup();
diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
index 932d6b1c9d0b..6c395fcece58 100644
--- a/drivers/net/wireless/airo.c
+++ b/drivers/net/wireless/airo.c
@@ -5625,9 +5625,9 @@ static int __init airo_init_module( void )
         int have_isa_dev = 0;
 #endif
 
-        airo_entry = create_proc_entry("aironet",
+        airo_entry = create_proc_entry("driver/aironet",
                                        S_IFDIR | airo_perm,
-                                       proc_root_driver);
+                                       NULL);
 
         if (airo_entry) {
                 airo_entry->uid = proc_uid;
@@ -5651,7 +5651,7 @@ static int __init airo_init_module( void )
         airo_print_info("", "Finished probing for PCI adapters");
 
         if (i) {
-                remove_proc_entry("aironet", proc_root_driver);
+                remove_proc_entry("driver/aironet", NULL);
                 return i;
         }
 #endif
@@ -5673,7 +5673,7 @@ static void __exit airo_cleanup_module( void )
 #ifdef CONFIG_PCI
         pci_unregister_driver(&airo_driver);
 #endif
-        remove_proc_entry("aironet", proc_root_driver);
+        remove_proc_entry("driver/aironet", NULL);
 }
 
 /*
diff --git a/fs/proc/root.c b/fs/proc/root.c
index 596abb690afa..5e93e9b0124e 100644
--- a/fs/proc/root.c
+++ b/fs/proc/root.c
@@ -22,8 +22,6 @@
 
 #include "internal.h"
 
-struct proc_dir_entry *proc_root_driver;
-
 static int proc_test_super(struct super_block *sb, void *data)
 {
         return sb->s_fs_info == data;
@@ -127,7 +125,7 @@ void __init proc_root_init(void)
         proc_mkdir("sysvipc", NULL);
 #endif
         proc_mkdir("fs", NULL);
-        proc_root_driver = proc_mkdir("driver", NULL);
+        proc_mkdir("driver", NULL);
         proc_mkdir("fs/nfsd", NULL); /* somewhere for the nfsd filesystem to be mounted */
 #if defined(CONFIG_SUN_OPENPROMFS) || defined(CONFIG_SUN_OPENPROMFS_MODULE)
         /* just give it a mountpoint */
@@ -235,4 +233,3 @@ EXPORT_SYMBOL(create_proc_entry);
 EXPORT_SYMBOL(proc_create);
 EXPORT_SYMBOL(remove_proc_entry);
 EXPORT_SYMBOL(proc_root);
-EXPORT_SYMBOL(proc_root_driver);
diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h
index 65582f0384e0..f56205cbebc0 100644
--- a/include/linux/proc_fs.h
+++ b/include/linux/proc_fs.h
@@ -97,7 +97,6 @@ struct vmcore {
 #ifdef CONFIG_PROC_FS
 
 extern struct proc_dir_entry proc_root;
-extern struct proc_dir_entry *proc_root_driver;
 extern struct proc_dir_entry *proc_root_kcore;
 
 extern spinlock_t proc_subdir_lock;
@@ -211,8 +210,6 @@ extern void dup_mm_exe_file(struct mm_struct *oldmm, struct mm_struct *newmm);
 
 #else
 
-#define proc_root_driver 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) {}