diff options
| author | Alexey Dobriyan <adobriyan@gmail.com> | 2010-01-17 03:35:32 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-01-17 19:16:02 -0800 |
| commit | 2c8c1e7297e19bdef3c178c3ea41d898a7716e3e (patch) | |
| tree | 4d336562e8d5379732a0646e17b0bb1750111ef6 /net/phonet | |
| parent | 72659ecce68588b74f6c46862c2b4cec137d7a5a (diff) | |
| download | linux-3.10-2c8c1e7297e19bdef3c178c3ea41d898a7716e3e.tar.gz linux-3.10-2c8c1e7297e19bdef3c178c3ea41d898a7716e3e.tar.bz2 linux-3.10-2c8c1e7297e19bdef3c178c3ea41d898a7716e3e.zip | |
net: spread __net_init, __net_exit
__net_init/__net_exit are apparently not going away, so use them
to full extent.
In some cases __net_init was removed, because it was called from
__net_exit code.
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/phonet')
| -rw-r--r-- | net/phonet/pn_dev.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/phonet/pn_dev.c b/net/phonet/pn_dev.c index bc4a33bf2d3..c597cc53a6f 100644 --- a/net/phonet/pn_dev.c +++ b/net/phonet/pn_dev.c @@ -311,7 +311,7 @@ static struct notifier_block phonet_device_notifier = { }; /* Per-namespace Phonet devices handling */ -static int phonet_init_net(struct net *net) +static int __net_init phonet_init_net(struct net *net) { struct phonet_net *pnn = net_generic(net, phonet_net_id); @@ -324,7 +324,7 @@ static int phonet_init_net(struct net *net) return 0; } -static void phonet_exit_net(struct net *net) +static void __net_exit phonet_exit_net(struct net *net) { struct phonet_net *pnn = net_generic(net, phonet_net_id); struct net_device *dev; |