2 files changed, 6 insertions, 7 deletions

diff --git a/drivers/pnp/isapnp/proc.c b/drivers/pnp/isapnp/proc.c
index 2b8266c3d40f..3f94edab25fa 100644
--- a/drivers/pnp/isapnp/proc.c
+++ b/drivers/pnp/isapnp/proc.c
@@ -85,6 +85,7 @@ static ssize_t isapnp_proc_bus_read(struct file *file, char __user * buf,
 }
 
 static const struct file_operations isapnp_proc_bus_file_operations = {
+        .owner  = THIS_MODULE,
         .llseek = isapnp_proc_bus_lseek,
         .read = isapnp_proc_bus_read,
 };
@@ -102,12 +103,10 @@ static int isapnp_proc_attach_device(struct pnp_dev *dev)
                         return -ENOMEM;
         }
         sprintf(name, "%02x", dev->number);
-        e = dev->procent = create_proc_entry(name, S_IFREG | S_IRUGO, de);
+        e = dev->procent = proc_create_data(name, S_IFREG | S_IRUGO, de,
+                        &isapnp_proc_bus_file_operations, dev);
         if (!e)
                 return -ENOMEM;
-        e->proc_fops = &isapnp_proc_bus_file_operations;
-        e->owner = THIS_MODULE;
-        e->data = dev;
         e->size = 256;
         return 0;
 }
@@ -116,7 +115,7 @@ int __init isapnp_proc_init(void)
 {
         struct pnp_dev *dev;
 
-        isapnp_proc_bus_dir = proc_mkdir("isapnp", proc_bus);
+        isapnp_proc_bus_dir = proc_mkdir("bus/isapnp", NULL);
         protocol_for_each_dev(&isapnp_protocol, dev) {
                 isapnp_proc_attach_device(dev);
         }
diff --git a/drivers/pnp/pnpbios/proc.c b/drivers/pnp/pnpbios/proc.c
index 4f89f1677e69..b35d921bac6e 100644
--- a/drivers/pnp/pnpbios/proc.c
+++ b/drivers/pnp/pnpbios/proc.c
@@ -256,7 +256,7 @@ int pnpbios_interface_attach_device(struct pnp_bios_node *node)
  */
 int __init pnpbios_proc_init(void)
 {
-        proc_pnp = proc_mkdir("pnp", proc_bus);
+        proc_pnp = proc_mkdir("bus/pnp", NULL);
         if (!proc_pnp)
                 return -EIO;
         proc_pnp_boot = proc_mkdir("boot", proc_pnp);
@@ -294,5 +294,5 @@ void __exit pnpbios_proc_exit(void)
         remove_proc_entry("configuration_info", proc_pnp);
         remove_proc_entry("devices", proc_pnp);
         remove_proc_entry("boot", proc_pnp);
-        remove_proc_entry("pnp", proc_bus);
+        remove_proc_entry("bus/pnp", NULL);
 }