diff --git a/modules/cas_disk/main.c b/modules/cas_disk/main.c index 85a4afa..d187a08 100644 --- a/modules/cas_disk/main.c +++ b/modules/cas_disk/main.c @@ -27,38 +27,6 @@ uint32_t casdsk_get_version(void) } EXPORT_SYMBOL(casdsk_get_version); -static void _casdsk_module_release(struct kobject *kobj) -{ - struct casdsk_module *mod; - - CASDSK_DEBUG_TRACE(); - - BUG_ON(!kobj); - - mod = container_of(kobj, struct casdsk_module, kobj); - BUG_ON(!mod); - - kfree(mod); -} - -static struct kobj_type _casdsk_module_ktype = { - .release = _casdsk_module_release, -}; - -static int __init casdsk_init_kobjects(void) -{ - int result = 0; - - CASDSK_DEBUG_TRACE(); - - kobject_init(&casdsk_module->kobj, &_casdsk_module_ktype); - result = kobject_add(&casdsk_module->kobj, kernel_kobj, "cas_disk"); - if (result) - CASDSK_DEBUG_ERROR("Cannot register kobject"); - - return result; -} - static int __init casdsk_init_module(void) { int result = 0; @@ -81,10 +49,6 @@ static int __init casdsk_init_module(void) if (result) goto error_init_disks; - result = casdsk_init_kobjects(); - if (result) - goto error_kobjects; - mutex_unlock(&casdsk_module->lock); printk(CASDSK_KERN_INFO "%s Version %s (%s)::Module loaded successfully\n", @@ -92,8 +56,6 @@ static int __init casdsk_init_module(void) return result; -error_kobjects: - casdsk_deinit_disks(); error_init_disks: casdsk_deinit_exp_objs(); error_init_exp_objs: @@ -104,15 +66,10 @@ error_kmalloc: } module_init(casdsk_init_module); -static void __exit casdsk_deinit_kobjects(void) -{ - kobject_put(&casdsk_module->kobj); -} - static void __exit casdsk_exit_module(void) { casdsk_deinit_disks(); casdsk_deinit_exp_objs(); - casdsk_deinit_kobjects(); + kfree(casdsk_module); } module_exit(casdsk_exit_module);