[PATCH] INPUT: remove the input_class structure, as it is unused.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/input/input.c b/drivers/input/input.c
index 0d570cf92dc2ba329c724865cd44dc23f2a4b57d..5c9044dbf00e3f486ebd334b6311b4e4cc7c3e04 100644 (file)
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -39,7 +39,6 @@ EXPORT_SYMBOL(input_close_device);
 EXPORT_SYMBOL(input_accept_process);
 EXPORT_SYMBOL(input_flush_device);
 EXPORT_SYMBOL(input_event);
-EXPORT_SYMBOL(input_class);
 EXPORT_SYMBOL_GPL(input_dev_class);
 
 #define INPUT_DEVICES  256
@@ -927,8 +926,6 @@ static struct file_operations input_fops = {
        .open = input_open_file,
 };
 
-struct class *input_class;
-
 static int __init input_init(void)
 {
        int err;
@@ -939,27 +936,19 @@ static int __init input_init(void)
                return err;
        }
 
-       input_class = class_create(THIS_MODULE, "input");
-       if (IS_ERR(input_class)) {
-               printk(KERN_ERR "input: unable to register input class\n");
-               err = PTR_ERR(input_class);
-               goto fail1;
-       }
-
        err = input_proc_init();
        if (err)
-               goto fail2;
+               goto fail1;
 
        err = register_chrdev(INPUT_MAJOR, "input", &input_fops);
        if (err) {
                printk(KERN_ERR "input: unable to register char major %d", INPUT_MAJOR);
-               goto fail3;
+               goto fail2;
        }
 
        return 0;
 
- fail3:        input_proc_exit();
- fail2:        class_destroy(input_class);
+ fail2:        input_proc_exit();
  fail1:        class_unregister(&input_dev_class);
        return err;
 }
@@ -968,7 +957,6 @@ static void __exit input_exit(void)
 {
        input_proc_exit();
        unregister_chrdev(INPUT_MAJOR, "input");
-       class_destroy(input_class);
        class_unregister(&input_dev_class);
 }
 

diff --git a/include/linux/input.h b/include/linux/input.h
index 5de844157fa93b6e9dda0d3d473e94a345657373..256e88755f12f28cd05460f9a4696f255cbe7cae 100644 (file)
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@ -1074,7 +1074,6 @@ static inline void input_set_abs_params(struct input_dev *dev, int axis, int min
        dev->absbit[LONG(axis)] |= BIT(axis);
 }
 
-extern struct class *input_class;
 extern struct class input_dev_class;
 
 #endif