lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Phonet: allow phonet_device_init() to fail, put it to __init section

Browse Source 
Signed-off-by: Rémi Denis-Courmont <remi.denis-courmont@nokia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
remi.denis-courmont@nokia
2009-01-23 03:00:27 +00:00
committed by David S. Miller
parent 4b8f704bea
commit 76e02cf694
4 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/net/phonet/phonet.h
View File

@@ -105,7 +105,6 @@ void phonet_proto_unregister(int protocol, struct phonet_protocol *pp);
int phonet_sysctl_init(void); int phonet_sysctl_init(void);
void phonet_sysctl_exit(void); void phonet_sysctl_exit(void);
void phonet_netlink_register(void);
int isi_register(void); int isi_register(void);
void isi_unregister(void); void isi_unregister(void);

3
include/net/phonet/pn_dev.h
View File

@@ -36,8 +36,9 @@ struct phonet_device {
DECLARE_BITMAP(addrs, 64); DECLARE_BITMAP(addrs, 64);
}; };
void phonet_device_init(void); int phonet_device_init(void);
void phonet_device_exit(void); void phonet_device_exit(void);
void phonet_netlink_register(void);
struct net_device *phonet_device_get(struct net *net); struct net_device *phonet_device_get(struct net *net);
int phonet_address_add(struct net_device *dev, u8 addr); int phonet_address_add(struct net_device *dev, u8 addr);

9
net/phonet/af_phonet.c
View File

@@ -426,16 +426,18 @@ static int __init phonet_init(void)
{ {
int err; int err;
err = phonet_device_init();
if (err)
return err;
err = sock_register(&phonet_proto_family); err = sock_register(&phonet_proto_family);
if (err) { if (err) {
printk(KERN_ALERT printk(KERN_ALERT
"phonet protocol family initialization failed\n"); "phonet protocol family initialization failed\n");
return err; goto err_sock;
} }
phonet_device_init();
dev_add_pack(&phonet_packet_type); dev_add_pack(&phonet_packet_type);
phonet_netlink_register();
phonet_sysctl_init(); phonet_sysctl_init();
err = isi_register(); err = isi_register();
@@ -447,6 +449,7 @@ err:
phonet_sysctl_exit(); phonet_sysctl_exit();
sock_unregister(PF_PHONET); sock_unregister(PF_PHONET);
dev_remove_pack(&phonet_packet_type); dev_remove_pack(&phonet_packet_type);
err_sock:
phonet_device_exit(); phonet_device_exit();
return err; return err;
} }

4
net/phonet/pn_dev.c
View File

@@ -188,9 +188,11 @@ static struct notifier_block phonet_device_notifier = {
}; };
/* Initialize Phonet devices list */ /* Initialize Phonet devices list */
void phonet_device_init(void) int __init phonet_device_init(void)
{ {
register_netdevice_notifier(&phonet_device_notifier); register_netdevice_notifier(&phonet_device_notifier);
phonet_netlink_register();
return 0;
} }
void phonet_device_exit(void) void phonet_device_exit(void)