Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild...

[linux-2.6-omap-h63xx.git] / drivers / misc / hdpuftrs / hdpu_nexus.c

diff --git a/drivers/misc/hdpuftrs/hdpu_nexus.c b/drivers/misc/hdpuftrs/hdpu_nexus.c
index 2fa36f7a6eb388ec02db087560ec3dca4c8b2d1d..ce39fa54949ba39645d80e1af92a035bc0aa099b 100644 (file)
--- a/drivers/misc/hdpuftrs/hdpu_nexus.c
+++ b/drivers/misc/hdpuftrs/hdpu_nexus.c
@@ -102,23 +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, &proc_root);
+       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, &proc_root);
-       if (!hdpu_chassis_id) {
+       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;
 }
@@ -128,8 +122,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;