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

[PATCH] Add kernel portion of user CM implementation (fix)

Browse Source 
Include the patch openib-general changing class_simple to class.

Signed-off-by: Tom Duffy <tduffy@sun.com>
Cc: Hal Rosenstock <halr@voltaire.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Tom Duffy
2005-07-27 11:45:45 -07:00
committed by Linus Torvalds
parent a5b7454077
commit 2d0d099f19
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/infiniband/core/ucm.c
View File

@@ -1339,7 +1339,7 @@ static struct file_operations ib_ucm_fops = {
}; };
static struct class_simple *ib_ucm_class; static struct class *ib_ucm_class;
static struct cdev ib_ucm_cdev; static struct cdev ib_ucm_cdev;
static int __init ib_ucm_init(void) static int __init ib_ucm_init(void)
@@ -1360,17 +1360,14 @@ static int __init ib_ucm_init(void)
goto err_cdev; goto err_cdev;
} }
ib_ucm_class = class_simple_create(THIS_MODULE, "infiniband_cm"); ib_ucm_class = class_create(THIS_MODULE, "infiniband_cm");
if (IS_ERR(ib_ucm_class)) { if (IS_ERR(ib_ucm_class)) {
result = PTR_ERR(ib_ucm_class); result = PTR_ERR(ib_ucm_class);
printk(KERN_ERR "UCM: Error <%d> creating class\n", result); printk(KERN_ERR "UCM: Error <%d> creating class\n", result);
goto err_class; goto err_class;
} }
class_simple_device_add(ib_ucm_class, class_device_create(ib_ucm_class, IB_UCM_DEV, NULL, "ucm");
IB_UCM_DEV,
NULL,
"ucm");
idr_init(&ctx_id_table); idr_init(&ctx_id_table);
init_MUTEX(&ctx_id_mutex); init_MUTEX(&ctx_id_mutex);
@@ -1386,8 +1383,8 @@ err_chr:
static void __exit ib_ucm_cleanup(void) static void __exit ib_ucm_cleanup(void)
{ {
class_simple_device_remove(IB_UCM_DEV); class_device_destroy(ib_ucm_class, IB_UCM_DEV);
class_simple_destroy(ib_ucm_class); class_destroy(ib_ucm_class);
cdev_del(&ib_ucm_cdev); cdev_del(&ib_ucm_cdev);
unregister_chrdev_region(IB_UCM_DEV, 1); unregister_chrdev_region(IB_UCM_DEV, 1);
} }