drivers: use non-racy method for proc entries creation (2)

Use proc_create()/proc_create_data() to make sure that ->proc_fops and ->data
be setup before gluing PDE to main tree.

Signed-off-by: Denis V. Lunev <den@openvz.org>
Cc: Greg Kroah-Hartman <gregkh@suse.de>
Cc: Alexey Dobriyan <adobriyan@gmail.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Peter Osterlund <petero2@telia.com>
Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Cc: Dmitry Torokhov <dtor@mail.ru>
Cc: Neil Brown <neilb@suse.de>
Cc: Mauro Carvalho Chehab <mchehab@infradead.org>
Cc: Bjorn Helgaas <bjorn.helgaas@hp.com>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

2 files changed, 5 insertions, 13 deletions

diff --git a/drivers/misc/hdpuftrs/hdpu_cpustate.c b/drivers/misc/hdpuftrs/hdpu_cpustate.c
index 154155c9b638..ff51ab67231c 100644
--- a/drivers/misc/hdpuftrs/hdpu_cpustate.c
+++ b/drivers/misc/hdpuftrs/hdpu_cpustate.c
@@ -210,13 +210,10 @@ static int hdpu_cpustate_probe(struct platform_device *pdev)
                 return ret;
         }
 
-        proc_de = create_proc_entry("sky_cpustate", 0666, NULL);
+        proc_de = proc_create("sky_cpustate", 0666, NULL, &proc_cpustate);
         if (!proc_de) {
                 printk(KERN_WARNING "sky_cpustate: "
                        "Unable to create proc entry\n");
-        } else {
-                proc_de->proc_fops = &proc_cpustate;
-                proc_de->owner = THIS_MODULE;
         }
 
         printk(KERN_INFO "Sky CPU State Driver v" SKY_CPUSTATE_VERSION "\n");
diff --git a/drivers/misc/hdpuftrs/hdpu_nexus.c b/drivers/misc/hdpuftrs/hdpu_nexus.c
index e92b7efccc72..08e26beefe64 100644
--- a/drivers/misc/hdpuftrs/hdpu_nexus.c
+++ b/drivers/misc/hdpuftrs/hdpu_nexus.c
@@ -102,22 +102,17 @@ 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, NULL);
-        if (!hdpu_slot_id)
+        hdpu_slot_id = proc_create("sky_slot_id", 0666, NULL, &proc_slot_id);
+        if (!hdpu_slot_id) {
                 printk(KERN_WARNING "sky_nexus: "
                        "Unable to create proc dir entry: sky_slot_id\n");
-        } else {
-                hdpu_slot_id->proc_fops = &proc_slot_id;
-                hdpu_slot_id->owner = THIS_MODULE;
         }
 
-        hdpu_chassis_id = create_proc_entry("sky_chassis_id", 0666, NULL);
+        hdpu_chassis_id = proc_create("sky_chassis_id", 0666, NULL,
+                                      &proc_chassis_id);
         if (!hdpu_chassis_id)
                 printk(KERN_WARNING "sky_nexus: "
                        "Unable to create proc dir entry: sky_chassis_id\n");
-        } else {
-                hdpu_chassis_id->proc_fops = &proc_chassis_id;
-                hdpu_chassis_id->owner = THIS_MODULE;
         }
 
         return 0;