diff options
Diffstat (limited to 'drivers/input/input.c')
| -rw-r--r-- | drivers/input/input.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/input/input.c b/drivers/input/input.c index 3385dd03abfc..83c77c990dda 100644 --- a/drivers/input/input.c +++ b/drivers/input/input.c | |||
| @@ -702,13 +702,13 @@ static int __init input_proc_init(void) | |||
| 702 | static inline int input_proc_init(void) { return 0; } | 702 | static inline int input_proc_init(void) { return 0; } |
| 703 | #endif | 703 | #endif |
| 704 | 704 | ||
| 705 | struct class_simple *input_class; | 705 | struct class *input_class; |
| 706 | 706 | ||
| 707 | static int __init input_init(void) | 707 | static int __init input_init(void) |
| 708 | { | 708 | { |
| 709 | int retval = -ENOMEM; | 709 | int retval = -ENOMEM; |
| 710 | 710 | ||
| 711 | input_class = class_simple_create(THIS_MODULE, "input"); | 711 | input_class = class_create(THIS_MODULE, "input"); |
| 712 | if (IS_ERR(input_class)) | 712 | if (IS_ERR(input_class)) |
| 713 | return PTR_ERR(input_class); | 713 | return PTR_ERR(input_class); |
| 714 | input_proc_init(); | 714 | input_proc_init(); |
| @@ -718,7 +718,7 @@ static int __init input_init(void) | |||
| 718 | remove_proc_entry("devices", proc_bus_input_dir); | 718 | remove_proc_entry("devices", proc_bus_input_dir); |
| 719 | remove_proc_entry("handlers", proc_bus_input_dir); | 719 | remove_proc_entry("handlers", proc_bus_input_dir); |
| 720 | remove_proc_entry("input", proc_bus); | 720 | remove_proc_entry("input", proc_bus); |
| 721 | class_simple_destroy(input_class); | 721 | class_destroy(input_class); |
| 722 | return retval; | 722 | return retval; |
| 723 | } | 723 | } |
| 724 | 724 | ||
| @@ -728,7 +728,7 @@ static int __init input_init(void) | |||
| 728 | remove_proc_entry("handlers", proc_bus_input_dir); | 728 | remove_proc_entry("handlers", proc_bus_input_dir); |
| 729 | remove_proc_entry("input", proc_bus); | 729 | remove_proc_entry("input", proc_bus); |
| 730 | unregister_chrdev(INPUT_MAJOR, "input"); | 730 | unregister_chrdev(INPUT_MAJOR, "input"); |
| 731 | class_simple_destroy(input_class); | 731 | class_destroy(input_class); |
| 732 | } | 732 | } |
| 733 | return retval; | 733 | return retval; |
| 734 | } | 734 | } |
| @@ -741,7 +741,7 @@ static void __exit input_exit(void) | |||
| 741 | 741 | ||
| 742 | devfs_remove("input"); | 742 | devfs_remove("input"); |
| 743 | unregister_chrdev(INPUT_MAJOR, "input"); | 743 | unregister_chrdev(INPUT_MAJOR, "input"); |
| 744 | class_simple_destroy(input_class); | 744 | class_destroy(input_class); |
| 745 | } | 745 | } |
| 746 | 746 | ||
| 747 | subsys_initcall(input_init); | 747 | subsys_initcall(input_init); |
