[PATCH] INPUT: move to use the new class code, instead of class_simple
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
7fe845d11a
commit
1235686f6e
@ -702,13 +702,13 @@ static int __init input_proc_init(void)
|
||||
static inline int input_proc_init(void) { return 0; }
|
||||
#endif
|
||||
|
||||
struct class_simple *input_class;
|
||||
struct class *input_class;
|
||||
|
||||
static int __init input_init(void)
|
||||
{
|
||||
int retval = -ENOMEM;
|
||||
|
||||
input_class = class_simple_create(THIS_MODULE, "input");
|
||||
input_class = class_create(THIS_MODULE, "input");
|
||||
if (IS_ERR(input_class))
|
||||
return PTR_ERR(input_class);
|
||||
input_proc_init();
|
||||
@ -718,7 +718,7 @@ static int __init input_init(void)
|
||||
remove_proc_entry("devices", proc_bus_input_dir);
|
||||
remove_proc_entry("handlers", proc_bus_input_dir);
|
||||
remove_proc_entry("input", proc_bus);
|
||||
class_simple_destroy(input_class);
|
||||
class_destroy(input_class);
|
||||
return retval;
|
||||
}
|
||||
|
||||
@ -728,7 +728,7 @@ static int __init input_init(void)
|
||||
remove_proc_entry("handlers", proc_bus_input_dir);
|
||||
remove_proc_entry("input", proc_bus);
|
||||
unregister_chrdev(INPUT_MAJOR, "input");
|
||||
class_simple_destroy(input_class);
|
||||
class_destroy(input_class);
|
||||
}
|
||||
return retval;
|
||||
}
|
||||
@ -741,7 +741,7 @@ static void __exit input_exit(void)
|
||||
|
||||
devfs_remove("input");
|
||||
unregister_chrdev(INPUT_MAJOR, "input");
|
||||
class_simple_destroy(input_class);
|
||||
class_destroy(input_class);
|
||||
}
|
||||
|
||||
subsys_initcall(input_init);
|
||||
|
Reference in New Issue
Block a user