proc: remove proc_root from drivers

Remove proc_root export.  Creation and removal works well if parent PDE is
supplied as NULL -- it worked always that way.

So, one useless export removed and consistency added, some drivers created
PDEs with &proc_root as parent but removed them as NULL and so on.

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>

10 files changed, 22 insertions, 22 deletions

diff --git a/drivers/char/ip2/ip2main.c b/drivers/char/ip2/ip2main.c
index b1d6cad84282..a784f5e22ee9 100644
--- a/drivers/char/ip2/ip2main.c
+++ b/drivers/char/ip2/ip2main.c
@@ -423,7 +423,7 @@ cleanup_module(void)
         }
         put_tty_driver(ip2_tty_driver);
         unregister_chrdev(IP2_IPL_MAJOR, pcIpl);
-        remove_proc_entry("ip2mem", &proc_root);
+        remove_proc_entry("ip2mem", NULL);
 
         // free memory
         for (i = 0; i < IP2_MAX_BOARDS; i++) {
@@ -695,7 +695,7 @@ ip2_loadmain(int *iop, int *irqp, unsigned char *firmware, int firmsize)
                 }
         }
         /* Register the read_procmem thing */
-        if (!create_proc_info_entry("ip2mem",0,&proc_root,ip2_read_procmem)) {
+        if (!create_proc_info_entry("ip2mem",0,NULL,ip2_read_procmem)) {
                 printk(KERN_ERR "IP2: failed to register read_procmem\n");
         } else {
 
diff --git a/drivers/mca/mca-proc.c b/drivers/mca/mca-proc.c
index 33d5e0820cc5..81ea0d377bf4 100644
--- a/drivers/mca/mca-proc.c
+++ b/drivers/mca/mca-proc.c
@@ -183,7 +183,7 @@ void __init mca_do_proc_init(void)
         struct proc_dir_entry* node = NULL;
         struct mca_device *mca_dev;
 
-        proc_mca = proc_mkdir("mca", &proc_root);
+        proc_mca = proc_mkdir("mca", NULL);
         create_proc_read_entry("pos",0,proc_mca,get_mca_info,NULL);
         create_proc_read_entry("machine",0,proc_mca,get_mca_machine_info,NULL);
 
diff --git a/drivers/misc/hdpuftrs/hdpu_cpustate.c b/drivers/misc/hdpuftrs/hdpu_cpustate.c
index 302e92418bbe..154155c9b638 100644
--- a/drivers/misc/hdpuftrs/hdpu_cpustate.c
+++ b/drivers/misc/hdpuftrs/hdpu_cpustate.c
@@ -210,7 +210,7 @@ static int hdpu_cpustate_probe(struct platform_device *pdev)
                 return ret;
         }
 
-        proc_de = create_proc_entry("sky_cpustate", 0666, &proc_root);
+        proc_de = create_proc_entry("sky_cpustate", 0666, NULL);
         if (!proc_de) {
                 printk(KERN_WARNING "sky_cpustate: "
                        "Unable to create proc entry\n");
diff --git a/drivers/misc/hdpuftrs/hdpu_nexus.c b/drivers/misc/hdpuftrs/hdpu_nexus.c
index 2fa36f7a6eb3..e92b7efccc72 100644
--- a/drivers/misc/hdpuftrs/hdpu_nexus.c
+++ b/drivers/misc/hdpuftrs/hdpu_nexus.c
@@ -102,8 +102,8 @@ static int hdpu_nexus_probe(struct platform_device *pdev)
                 printk(KERN_ERR "sky_nexus: Could not map slot id\n");
         }
 
-        hdpu_slot_id = create_proc_entry("sky_slot_id", 0666, &proc_root);
-        if (!hdpu_slot_id) {
+        hdpu_slot_id = create_proc_entry("sky_slot_id", 0666, NULL);
+        if (!hdpu_slot_id)
                 printk(KERN_WARNING "sky_nexus: "
                        "Unable to create proc dir entry: sky_slot_id\n");
         } else {
@@ -111,8 +111,8 @@ static int hdpu_nexus_probe(struct platform_device *pdev)
                 hdpu_slot_id->owner = THIS_MODULE;
         }
 
-        hdpu_chassis_id = create_proc_entry("sky_chassis_id", 0666, &proc_root);
-        if (!hdpu_chassis_id) {
+        hdpu_chassis_id = create_proc_entry("sky_chassis_id", 0666, NULL);
+        if (!hdpu_chassis_id)
                 printk(KERN_WARNING "sky_nexus: "
                        "Unable to create proc dir entry: sky_chassis_id\n");
         } else {
@@ -128,8 +128,8 @@ static int hdpu_nexus_remove(struct platform_device *pdev)
         slot_id = -1;
         chassis_id = -1;
 
-        remove_proc_entry("sky_slot_id", &proc_root);
-        remove_proc_entry("sky_chassis_id", &proc_root);
+        remove_proc_entry("sky_slot_id", NULL);
+        remove_proc_entry("sky_chassis_id", NULL);
 
         hdpu_slot_id = 0;
         hdpu_chassis_id = 0;
diff --git a/drivers/s390/block/dasd_proc.c b/drivers/s390/block/dasd_proc.c
index 556063e8f7a9..8ae9406b10ad 100644
--- a/drivers/s390/block/dasd_proc.c
+++ b/drivers/s390/block/dasd_proc.c
@@ -311,7 +311,7 @@ out_error:
 int
 dasd_proc_init(void)
 {
-        dasd_proc_root_entry = proc_mkdir("dasd", &proc_root);
+        dasd_proc_root_entry = proc_mkdir("dasd", NULL);
         if (!dasd_proc_root_entry)
                 goto out_nodasd;
         dasd_proc_root_entry->owner = THIS_MODULE;
@@ -335,7 +335,7 @@ dasd_proc_init(void)
  out_nostatistics:
         remove_proc_entry("devices", dasd_proc_root_entry);
  out_nodevices:
-        remove_proc_entry("dasd", &proc_root);
+        remove_proc_entry("dasd", NULL);
  out_nodasd:
         return -ENOENT;
 }
@@ -345,5 +345,5 @@ dasd_proc_exit(void)
 {
         remove_proc_entry("devices", dasd_proc_root_entry);
         remove_proc_entry("statistics", dasd_proc_root_entry);
-        remove_proc_entry("dasd", &proc_root);
+        remove_proc_entry("dasd", NULL);
 }
diff --git a/drivers/s390/char/tape_proc.c b/drivers/s390/char/tape_proc.c
index c9b96d51b28f..0c39636b2174 100644
--- a/drivers/s390/char/tape_proc.c
+++ b/drivers/s390/char/tape_proc.c
@@ -125,7 +125,7 @@ tape_proc_init(void)
 {
         tape_proc_devices =
                 create_proc_entry ("tapedevices", S_IFREG | S_IRUGO | S_IWUSR,
-                                   &proc_root);
+                                   NULL);
         if (tape_proc_devices == NULL) {
                 PRINT_WARN("tape: Cannot register procfs entry tapedevices\n");
                 return;
@@ -141,5 +141,5 @@ void
 tape_proc_cleanup(void)
 {
         if (tape_proc_devices != NULL)
-                remove_proc_entry ("tapedevices", &proc_root);
+                remove_proc_entry ("tapedevices", NULL);
 }
diff --git a/drivers/s390/cio/blacklist.c b/drivers/s390/cio/blacklist.c
index e8597ec92247..ef33d5df2229 100644
--- a/drivers/s390/cio/blacklist.c
+++ b/drivers/s390/cio/blacklist.c
@@ -375,7 +375,7 @@ cio_ignore_proc_init (void)
         struct proc_dir_entry *entry;
 
         entry = create_proc_entry ("cio_ignore", S_IFREG | S_IRUGO | S_IWUSR,
-                                   &proc_root);
+                                   NULL);
         if (!entry)
                 return -ENOENT;
 
diff --git a/drivers/s390/cio/qdio.c b/drivers/s390/cio/qdio.c
index 10aa1e780801..43876e287370 100644
--- a/drivers/s390/cio/qdio.c
+++ b/drivers/s390/cio/qdio.c
@@ -3632,7 +3632,7 @@ qdio_add_procfs_entry(void)
 {
         proc_perf_file_registration=0;
         qdio_perf_proc_file=create_proc_entry(QDIO_PERF,
-                                              S_IFREG|0444,&proc_root);
+                                              S_IFREG|0444,NULL);
         if (qdio_perf_proc_file) {
                 qdio_perf_proc_file->read_proc=&qdio_perf_procfile_read;
         } else proc_perf_file_registration=-1;
@@ -3647,7 +3647,7 @@ static void
 qdio_remove_procfs_entry(void)
 {
         if (!proc_perf_file_registration) /* means if it went ok earlier */
-                remove_proc_entry(QDIO_PERF,&proc_root);
+                remove_proc_entry(QDIO_PERF,NULL);
 }
 
 /**
diff --git a/drivers/scsi/megaraid.c b/drivers/scsi/megaraid.c
index b135a1ed4b2c..18551aaf5e09 100644
--- a/drivers/scsi/megaraid.c
+++ b/drivers/scsi/megaraid.c
@@ -4996,7 +4996,7 @@ static int __init megaraid_init(void)
                 max_mbox_busy_wait = MBOX_BUSY_WAIT;
 
 #ifdef CONFIG_PROC_FS
-        mega_proc_dir_entry = proc_mkdir("megaraid", &proc_root);
+        mega_proc_dir_entry = proc_mkdir("megaraid", NULL);
         if (!mega_proc_dir_entry) {
                 printk(KERN_WARNING
                                 "megaraid: failed to create megaraid root\n");
@@ -5005,7 +5005,7 @@ static int __init megaraid_init(void)
         error = pci_register_driver(&megaraid_pci_driver);
         if (error) {
 #ifdef CONFIG_PROC_FS
-                remove_proc_entry("megaraid", &proc_root);
+                remove_proc_entry("megaraid", NULL);
 #endif
                 return error;
         }
@@ -5035,7 +5035,7 @@ static void __exit megaraid_exit(void)
         pci_unregister_driver(&megaraid_pci_driver);
 
 #ifdef CONFIG_PROC_FS
-        remove_proc_entry("megaraid", &proc_root);
+        remove_proc_entry("megaraid", NULL);
 #endif
 }
 
diff --git a/drivers/video/clps711xfb.c b/drivers/video/clps711xfb.c
index 17b5267f44d7..9f8a389dc7ae 100644
--- a/drivers/video/clps711xfb.c
+++ b/drivers/video/clps711xfb.c
@@ -381,7 +381,7 @@ int __init clps711xfb_init(void)
 
         /* Register the /proc entries. */
         clps7111fb_backlight_proc_entry = create_proc_entry("backlight", 0444,
-                &proc_root);
+                NULL);
         if (clps7111fb_backlight_proc_entry == NULL) {
                 printk("Couldn't create the /proc entry for the backlight.\n");
                 return -EINVAL;