2 files changed, 6 insertions, 11 deletions

diff --git a/net/core/neighbour.c b/net/core/neighbour.c
index 75075c303c44..5d9d7130bd6e 100644
--- a/net/core/neighbour.c
+++ b/net/core/neighbour.c
@@ -1430,11 +1430,10 @@ void neigh_table_init_no_netlink(struct neigh_table *tbl)
                 panic("cannot create neighbour cache statistics");
 
 #ifdef CONFIG_PROC_FS
-        tbl->pde = proc_create(tbl->id, 0, init_net.proc_net_stat,
-                               &neigh_stat_seq_fops);
+        tbl->pde = proc_create_data(tbl->id, 0, init_net.proc_net_stat,
+                                    &neigh_stat_seq_fops, tbl);
         if (!tbl->pde)
                 panic("cannot create neighbour proc dir entry");
-        tbl->pde->data = tbl;
 #endif
 
         tbl->hash_mask = 1;
diff --git a/net/core/pktgen.c b/net/core/pktgen.c
index a803b442234c..8dca21110493 100644
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
@@ -3570,15 +3570,14 @@ static int pktgen_add_device(struct pktgen_thread *t, const char *ifname)
         if (err)
                 goto out1;
 
-        pkt_dev->entry = proc_create(ifname, 0600,
-                                     pg_proc_dir, &pktgen_if_fops);
+        pkt_dev->entry = proc_create_data(ifname, 0600, pg_proc_dir,
+                                          &pktgen_if_fops, pkt_dev);
         if (!pkt_dev->entry) {
                 printk(KERN_ERR "pktgen: cannot create %s/%s procfs entry.\n",
                        PG_PROC_DIR, ifname);
                 err = -EINVAL;
                 goto out2;
         }
-        pkt_dev->entry->data = pkt_dev;
 #ifdef CONFIG_XFRM
         pkt_dev->ipsmode = XFRM_MODE_TRANSPORT;
         pkt_dev->ipsproto = IPPROTO_ESP;
@@ -3628,7 +3627,8 @@ static int __init pktgen_create_thread(int cpu)
         kthread_bind(p, cpu);
         t->tsk = p;
 
-        pe = proc_create(t->tsk->comm, 0600, pg_proc_dir, &pktgen_thread_fops);
+        pe = proc_create_data(t->tsk->comm, 0600, pg_proc_dir,
+                              &pktgen_thread_fops, t);
         if (!pe) {
                 printk(KERN_ERR "pktgen: cannot create %s/%s procfs entry.\n",
                        PG_PROC_DIR, t->tsk->comm);
@@ -3638,8 +3638,6 @@ static int __init pktgen_create_thread(int cpu)
                 return -EINVAL;
         }
 
-        pe->data = t;
-
         wake_up_process(p);
 
         return 0;
@@ -3716,8 +3714,6 @@ static int __init pg_init(void)
                 return -EINVAL;
         }
 
-        pe->data = NULL;
-
         /* Register us to receive netdevice events */
         register_netdevice_notifier(&pktgen_notifier_block);