Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 76e02cf6 authored by remi.denis-courmont@nokia's avatar remi.denis-courmont@nokia Committed by David S. Miller
Browse files

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



Signed-off-by: default avatarRémi Denis-Courmont <remi.denis-courmont@nokia.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4b8f704b

include/net/phonet/phonet.h

+0 −1
Original line number Diff line number Diff line
@@ -105,7 +105,6 @@ void phonet_proto_unregister(int protocol, struct phonet_protocol *pp); 


int phonet_sysctl_init(void);

void phonet_sysctl_exit(void);

void phonet_netlink_register(void);

int isi_register(void);

void isi_unregister(void);

include/net/phonet/pn_dev.h

+2 −1
Original line number Diff line number Diff line
@@ -36,8 +36,9 @@ struct phonet_device { 
	DECLARE_BITMAP(addrs, 64);

};



void phonet_device_init(void);

int phonet_device_init(void);

void phonet_device_exit(void);

void phonet_netlink_register(void);

struct net_device *phonet_device_get(struct net *net);



int phonet_address_add(struct net_device *dev, u8 addr);

net/phonet/af_phonet.c

+6 −3
Original line number Diff line number Diff line
@@ -426,16 +426,18 @@ static int __init phonet_init(void) 
{

	int err;



	err = phonet_device_init();

	if (err)

		return err;



	err = sock_register(&phonet_proto_family);

	if (err) {

		printk(KERN_ALERT

			"phonet protocol family initialization failed\n");

		return err;

		goto err_sock;

	}



	phonet_device_init();

	dev_add_pack(&phonet_packet_type);

	phonet_netlink_register();

	phonet_sysctl_init();



	err = isi_register();
@@ -447,6 +449,7 @@ err: 
	phonet_sysctl_exit();

	sock_unregister(PF_PHONET);

	dev_remove_pack(&phonet_packet_type);

err_sock:

	phonet_device_exit();

	return err;

}

net/phonet/pn_dev.c

+3 −1
Original line number Diff line number Diff line
@@ -188,9 +188,11 @@ static struct notifier_block phonet_device_notifier = { 
};



/* Initialize Phonet devices list */

void phonet_device_init(void)

int __init phonet_device_init(void)

{

	register_netdevice_notifier(&phonet_device_notifier);

	phonet_netlink_register();

	return 0;

}



void phonet_device_exit(void)