diff options
Diffstat (limited to 'drivers/staging/ozwpan/ozmain.c')
| -rw-r--r-- | drivers/staging/ozwpan/ozmain.c | 29 |
1 files changed, 12 insertions, 17 deletions
diff --git a/drivers/staging/ozwpan/ozmain.c b/drivers/staging/ozwpan/ozmain.c index ef6c5ab753e..d1a5b7a2c16 100644 --- a/drivers/staging/ozwpan/ozmain.c +++ b/drivers/staging/ozwpan/ozmain.c @@ -3,6 +3,7 @@ * Released under the GNU General Public License Version 2 (GPLv2). * ----------------------------------------------------------------------------- */ + #include <linux/init.h> #include <linux/module.h> #include <linux/timer.h> @@ -10,35 +11,34 @@ #include <linux/netdevice.h> #include <linux/errno.h> #include <linux/ieee80211.h> -#include "ozconfig.h" +#include "ozdbg.h" #include "ozpd.h" #include "ozproto.h" #include "ozcdev.h" -#include "oztrace.h" -#include "ozevent.h" -/*------------------------------------------------------------------------------ + +unsigned int oz_dbg_mask = OZ_DEFAULT_DBG_MASK; + +/* * The name of the 802.11 mac device. Empty string is the default value but a * value can be supplied as a parameter to the module. An empty string means * bind to nothing. '*' means bind to all netcards - this includes non-802.11 * netcards. Bindings can be added later using an IOCTL. */ -char *g_net_dev = ""; -/*------------------------------------------------------------------------------ +static char *g_net_dev = ""; + +/* * Context: process */ static int __init ozwpan_init(void) { - oz_event_init(); oz_cdev_register(); oz_protocol_init(g_net_dev); oz_app_enable(OZ_APPID_USB, 1); oz_apps_init(); -#ifdef CONFIG_DEBUG_FS - oz_debugfs_init(); -#endif return 0; } -/*------------------------------------------------------------------------------ + +/* * Context: process */ static void __exit ozwpan_exit(void) @@ -46,13 +46,8 @@ static void __exit ozwpan_exit(void) oz_protocol_term(); oz_apps_term(); oz_cdev_deregister(); - oz_event_term(); -#ifdef CONFIG_DEBUG_FS - oz_debugfs_remove(); -#endif } -/*------------------------------------------------------------------------------ - */ + module_param(g_net_dev, charp, S_IRUGO); module_init(ozwpan_init); module_exit(ozwpan_exit); |