Commit 2d0d099f authored by Tom Duffy's avatar Tom Duffy Committed by Linus Torvalds
Browse files

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



Include the patch openib-general changing class_simple to class.
Signed-off-by: default avatarTom Duffy <tduffy@sun.com>
Cc: Hal Rosenstock <halr@voltaire.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent a5b74540
...@@ -1339,7 +1339,7 @@ static struct file_operations ib_ucm_fops = { ...@@ -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) ...@@ -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: ...@@ -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);
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment