diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-11-23 02:00:47 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-11-23 02:00:47 +0000 |
| commit | 06615f62b17d7de6e12d2f5ec6b88cf30af08413 (patch) | |
| tree | 8766f208847d4876a6db619aebbf54d53b76eb44 /net/irda | |
| parent | fa9bdb574f4febb751848a685d9a9017e04e1d53 (diff) | |
Merge with Linux 2.4.0-test10.
Diffstat (limited to 'net/irda')
| -rw-r--r-- | net/irda/af_irda.c | 21 | ||||
| -rw-r--r-- | net/irda/irmod.c | 26 |
2 files changed, 14 insertions, 33 deletions
diff --git a/net/irda/af_irda.c b/net/irda/af_irda.c index 2ba86afcc..69db79a0e 100644 --- a/net/irda/af_irda.c +++ b/net/irda/af_irda.c @@ -43,10 +43,10 @@ ********************************************************************/ #include <linux/config.h> +#include <linux/init.h> #include <linux/types.h> #include <linux/socket.h> #include <linux/sockios.h> -#include <linux/init.h> #include <linux/if_arp.h> #include <linux/net.h> #include <linux/irda.h> @@ -2155,17 +2155,19 @@ static struct notifier_block irda_dev_notifier = { * Initialize IrDA protocol layer * */ -void __init irda_proto_init(struct net_proto *pro) +static int __init irda_proto_init(void) { - sock_register(&irda_family_ops); - - irda_packet_type.type = htons(ETH_P_IRDA); + sock_register(&irda_family_ops); + + irda_packet_type.type = htons(ETH_P_IRDA); dev_add_pack(&irda_packet_type); - - register_netdevice_notifier(&irda_dev_notifier); - - irda_init(); + + register_netdevice_notifier(&irda_dev_notifier); + + irda_init(); + return 0; } +module_init(irda_proto_init); /* * Function irda_proto_cleanup (void) @@ -2186,4 +2188,5 @@ void irda_proto_cleanup(void) return; } +module_exit(irda_proto_cleanup); #endif /* MODULE */ diff --git a/net/irda/irmod.c b/net/irda/irmod.c index fde6788c3..39257f87a 100644 --- a/net/irda/irmod.c +++ b/net/irda/irmod.c @@ -545,28 +545,6 @@ void irda_proc_modcount(struct inode *inode, int fill) MODULE_AUTHOR("Dag Brattli <dagb@cs.uit.no>"); MODULE_DESCRIPTION("The Linux IrDA Protocol Subsystem"); MODULE_PARM(irda_debug, "1l"); - -/* - * Function init_module (void) - * - * Initialize the irda module - * - */ -int init_module(void) -{ - irda_proto_init(NULL); - - return 0; -} - -/* - * Function cleanup_module (void) - * - * Cleanup the irda module - * - */ -void cleanup_module(void) -{ - irda_proto_cleanup(); -} +module_exit(irda_proto_cleanup); #endif /* MODULE */ + |