aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/input.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/input/input.c')
-rw-r--r--drivers/input/input.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/input/input.c b/drivers/input/input.c
index c1dbc04cf54a..7c4b4d37b3e6 100644
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -729,13 +729,13 @@ static int __init input_proc_init(void)
729static inline int input_proc_init(void) { return 0; } 729static inline int input_proc_init(void) { return 0; }
730#endif 730#endif
731 731
732struct class_simple *input_class; 732struct class *input_class;
733 733
734static int __init input_init(void) 734static int __init input_init(void)
735{ 735{
736 int retval = -ENOMEM; 736 int retval = -ENOMEM;
737 737
738 input_class = class_simple_create(THIS_MODULE, "input"); 738 input_class = class_create(THIS_MODULE, "input");
739 if (IS_ERR(input_class)) 739 if (IS_ERR(input_class))
740 return PTR_ERR(input_class); 740 return PTR_ERR(input_class);
741 input_proc_init(); 741 input_proc_init();
@@ -745,7 +745,7 @@ static int __init input_init(void)
745 remove_proc_entry("devices", proc_bus_input_dir); 745 remove_proc_entry("devices", proc_bus_input_dir);
746 remove_proc_entry("handlers", proc_bus_input_dir); 746 remove_proc_entry("handlers", proc_bus_input_dir);
747 remove_proc_entry("input", proc_bus); 747 remove_proc_entry("input", proc_bus);
748 class_simple_destroy(input_class); 748 class_destroy(input_class);
749 return retval; 749 return retval;
750 } 750 }
751 751
@@ -755,7 +755,7 @@ static int __init input_init(void)
755 remove_proc_entry("handlers", proc_bus_input_dir); 755 remove_proc_entry("handlers", proc_bus_input_dir);
756 remove_proc_entry("input", proc_bus); 756 remove_proc_entry("input", proc_bus);
757 unregister_chrdev(INPUT_MAJOR, "input"); 757 unregister_chrdev(INPUT_MAJOR, "input");
758 class_simple_destroy(input_class); 758 class_destroy(input_class);
759 } 759 }
760 return retval; 760 return retval;
761} 761}
@@ -768,7 +768,7 @@ static void __exit input_exit(void)
768 768
769 devfs_remove("input"); 769 devfs_remove("input");
770 unregister_chrdev(INPUT_MAJOR, "input"); 770 unregister_chrdev(INPUT_MAJOR, "input");
771 class_simple_destroy(input_class); 771 class_destroy(input_class);
772} 772}
773 773
774subsys_initcall(input_init); 774subsys_initcall(input_init);