Merge tag 'for-3.9-rc1' of git://gitorious.org/linux-pwm/linux-pwm

[~andy/linux] / net / phonet / pn_dev.c

diff --git a/net/phonet/pn_dev.c b/net/phonet/pn_dev.c
index 5bf6341e2dd47b1f1a0f6dd3a7a3f9c9c28562c3..45a7df6575ded371ef75fc11fc41a2b48371e51e 100644 (file)
--- a/net/phonet/pn_dev.c
+++ b/net/phonet/pn_dev.c
@@ -320,7 +320,7 @@ static int __net_init phonet_init_net(struct net *net)
 {
        struct phonet_net *pnn = phonet_pernet(net);
 
-       if (!proc_net_fops_create(net, "phonet", 0, &pn_sock_seq_fops))
+       if (!proc_create("phonet", 0, net->proc_net, &pn_sock_seq_fops))
                return -ENOMEM;
 
        INIT_LIST_HEAD(&pnn->pndevs.list);
@@ -331,7 +331,7 @@ static int __net_init phonet_init_net(struct net *net)
 
 static void __net_exit phonet_exit_net(struct net *net)
 {
-       proc_net_remove(net, "phonet");
+       remove_proc_entry("phonet", net->proc_net);
 }
 
 static struct pernet_operations phonet_net_ops = {
@@ -348,7 +348,7 @@ int __init phonet_device_init(void)
        if (err)
                return err;
 
-       proc_net_fops_create(&init_net, "pnresource", 0, &pn_res_seq_fops);
+       proc_create("pnresource", 0, init_net.proc_net, &pn_res_seq_fops);
        register_netdevice_notifier(&phonet_device_notifier);
        err = phonet_netlink_register();
        if (err)
@@ -361,7 +361,7 @@ void phonet_device_exit(void)
        rtnl_unregister_all(PF_PHONET);
        unregister_netdevice_notifier(&phonet_device_notifier);
        unregister_pernet_subsys(&phonet_net_ops);
-       proc_net_remove(&init_net, "pnresource");
+       remove_proc_entry("pnresource", init_net.proc_net);
 }
 
 int phonet_route_add(struct net_device *dev, u8 daddr)