net: proc: change proc_net_fops_create to proc_create

Right now, some modules such as bonding use proc_create
to create proc entries under /proc/net/, and other modules
such as ipv4 use proc_net_fops_create.

It looks a little chaos.this patch changes all of
proc_net_fops_create to proc_create. we can remove
proc_net_fops_create after this patch.

Signed-off-by: Gao feng <gaofeng@cn.fujitsu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

52 files changed, 100 insertions, 86 deletions

diff --git a/drivers/connector/connector.c b/drivers/connector/connector.c
index 7b695913cb30..ed17a57ab3cb 100644
--- a/drivers/connector/connector.c
+++ b/drivers/connector/connector.c
@@ -276,7 +276,7 @@ static int cn_init(void)
 
         cn_already_initialized = 1;
 
-        proc_net_fops_create(&init_net, "connector", S_IRUGO, &cn_file_ops);
+        proc_create("connector", S_IRUGO, init_net.proc_net, &cn_file_ops);
 
         return 0;
 }
diff --git a/drivers/net/hamradio/bpqether.c b/drivers/net/hamradio/bpqether.c
index c2e5497397d5..61f28842163d 100644
--- a/drivers/net/hamradio/bpqether.c
+++ b/drivers/net/hamradio/bpqether.c
@@ -586,7 +586,8 @@ static int bpq_device_event(struct notifier_block *this,unsigned long event, voi
 static int __init bpq_init_driver(void)
 {
 #ifdef CONFIG_PROC_FS
-        if (!proc_net_fops_create(&init_net, "bpqether", S_IRUGO, &bpq_info_fops)) {
+        if (!proc_create("bpqether", S_IRUGO, init_net.proc_net,
+                         &bpq_info_fops)) {
                 printk(KERN_ERR
                         "bpq: cannot create /proc/net/bpqether entry.\n");
                 return -ENOENT;
diff --git a/drivers/net/hamradio/scc.c b/drivers/net/hamradio/scc.c
index 1b4a47bd32b7..cab13f4d2942 100644
--- a/drivers/net/hamradio/scc.c
+++ b/drivers/net/hamradio/scc.c
@@ -2118,7 +2118,7 @@ static int __init scc_init_driver (void)
         }
         rtnl_unlock();
 
-        proc_net_fops_create(&init_net, "z8530drv", 0, &scc_net_seq_fops);
+        proc_create("z8530drv", 0, init_net.proc_net, &scc_net_seq_fops);
 
         return 0;
 }
diff --git a/drivers/net/hamradio/yam.c b/drivers/net/hamradio/yam.c
index c6645f1017af..92847d27b2e8 100644
--- a/drivers/net/hamradio/yam.c
+++ b/drivers/net/hamradio/yam.c
@@ -1167,7 +1167,7 @@ static int __init yam_init_driver(void)
         yam_timer.expires = jiffies + HZ / 100;
         add_timer(&yam_timer);
 
-        proc_net_fops_create(&init_net, "yam", S_IRUGO, &yam_info_fops);
+        proc_create("yam", S_IRUGO, init_net.proc_net, &yam_info_fops);
         return 0;
  error:
         while (--i >= 0) {
diff --git a/drivers/net/ppp/pppoe.c b/drivers/net/ppp/pppoe.c
index 20f31d0d1536..d7fa96c42ae7 100644
--- a/drivers/net/ppp/pppoe.c
+++ b/drivers/net/ppp/pppoe.c
@@ -1134,7 +1134,7 @@ static __net_init int pppoe_init_net(struct net *net)
 
         rwlock_init(&pn->hash_lock);
 
-        pde = proc_net_fops_create(net, "pppoe", S_IRUGO, &pppoe_seq_fops);
+        pde = proc_create("pppoe", S_IRUGO, net->proc_net, &pppoe_seq_fops);
 #ifdef CONFIG_PROC_FS
         if (!pde)
                 return -ENOMEM;
diff --git a/net/ax25/af_ax25.c b/net/ax25/af_ax25.c
index 779095ded689..b6ccbea3477e 100644
--- a/net/ax25/af_ax25.c
+++ b/net/ax25/af_ax25.c
@@ -1992,9 +1992,10 @@ static int __init ax25_init(void)
         dev_add_pack(&ax25_packet_type);
         register_netdevice_notifier(&ax25_dev_notifier);
 
-        proc_net_fops_create(&init_net, "ax25_route", S_IRUGO, &ax25_route_fops);
-        proc_net_fops_create(&init_net, "ax25", S_IRUGO, &ax25_info_fops);
-        proc_net_fops_create(&init_net, "ax25_calls", S_IRUGO, &ax25_uid_fops);
+        proc_create("ax25_route", S_IRUGO, init_net.proc_net,
+                    &ax25_route_fops);
+        proc_create("ax25", S_IRUGO, init_net.proc_net, &ax25_info_fops);
+        proc_create("ax25_calls", S_IRUGO, init_net.proc_net, &ax25_uid_fops);
 out:
         return rc;
 }
diff --git a/net/bluetooth/af_bluetooth.c b/net/bluetooth/af_bluetooth.c
index 5355df63d39b..8412b637407b 100644
--- a/net/bluetooth/af_bluetooth.c
+++ b/net/bluetooth/af_bluetooth.c
@@ -641,7 +641,7 @@ int bt_procfs_init(struct module* module, struct net *net, const char *name,
         sk_list->fops.llseek    = seq_lseek;
         sk_list->fops.release   = seq_release_private;
 
-        pde = proc_net_fops_create(net, name, 0, &sk_list->fops);
+        pde = proc_create(name, 0, net->proc_net, &sk_list->fops);
         if (!pde)
                 return -ENOMEM;
 
diff --git a/net/core/dev.c b/net/core/dev.c
index 1932d351ed7c..f2f81ef5bbd6 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -4518,11 +4518,12 @@ static int __net_init dev_proc_net_init(struct net *net)
 {
         int rc = -ENOMEM;
 
-        if (!proc_net_fops_create(net, "dev", S_IRUGO, &dev_seq_fops))
+        if (!proc_create("dev", S_IRUGO, net->proc_net, &dev_seq_fops))
                 goto out;
-        if (!proc_net_fops_create(net, "softnet_stat", S_IRUGO, &softnet_seq_fops))
+        if (!proc_create("softnet_stat", S_IRUGO, net->proc_net,
+                         &softnet_seq_fops))
                 goto out_dev;