1 files changed, 3 insertions, 8 deletions

diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
index 3b806c9fb005..3ba1df93e9e3 100644
--- a/drivers/block/pktcdvd.c
+++ b/drivers/block/pktcdvd.c
@@ -2742,7 +2742,6 @@ static int pkt_new_dev(struct pktcdvd_device *pd, dev_t dev)
         int i;
         int ret = 0;
         char b[BDEVNAME_SIZE];
-        struct proc_dir_entry *proc;
         struct block_device *bdev;
 
         if (pd->pkt_dev == dev) {
@@ -2786,11 +2785,7 @@ static int pkt_new_dev(struct pktcdvd_device *pd, dev_t dev)
                 goto out_mem;
         }
 
-        proc = create_proc_entry(pd->name, 0, pkt_proc);
-        if (proc) {
-                proc->data = pd;
-                proc->proc_fops = &pkt_proc_fops;
-        }
+        proc_create_data(pd->name, 0, pkt_proc, &pkt_proc_fops, pd);
         DPRINTK(DRIVER_NAME": writer %s mapped to %s\n", pd->name, bdevname(bdev, b));
         return 0;
 
@@ -3099,7 +3094,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;
 
@@ -3115,7 +3110,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();