summaryrefslogtreecommitdiffstats
path: root/drivers/input/input.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2005-10-28 07:25:43 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2005-10-28 18:52:55 +0200
commitea9f240bd819f9299703283e5326da606bbb4b05 (patch)
tree68b83a2a093a332c8fda8dfc695c73ebe084b014 /drivers/input/input.c
parent[PATCH] INPUT: remove the input_class structure, as it is unused. (diff)
downloadlinux-ea9f240bd819f9299703283e5326da606bbb4b05.tar.xz
linux-ea9f240bd819f9299703283e5326da606bbb4b05.zip
[PATCH] INPUT: rename input_dev_class to input_class to be correct.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/input/input.c')
-rw-r--r--drivers/input/input.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/input/input.c b/drivers/input/input.c
index 5c9044dbf00e..a8f65fa7e17a 100644
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -39,7 +39,7 @@ EXPORT_SYMBOL(input_close_device);
EXPORT_SYMBOL(input_accept_process);
EXPORT_SYMBOL(input_flush_device);
EXPORT_SYMBOL(input_event);
-EXPORT_SYMBOL_GPL(input_dev_class);
+EXPORT_SYMBOL_GPL(input_class);
#define INPUT_DEVICES 256
@@ -729,8 +729,8 @@ static void input_dev_release(struct class_device *class_dev)
module_put(THIS_MODULE);
}
-struct class input_dev_class = {
- .name = "input_dev",
+struct class input_class = {
+ .name = "input",
.release = input_dev_release,
};
@@ -741,7 +741,7 @@ struct input_dev *input_allocate_device(void)
dev = kzalloc(sizeof(struct input_dev), GFP_KERNEL);
if (dev) {
dev->dynalloc = 1;
- dev->cdev.class = &input_dev_class;
+ dev->cdev.class = &input_class;
class_device_initialize(&dev->cdev);
INIT_LIST_HEAD(&dev->h_list);
INIT_LIST_HEAD(&dev->node);
@@ -930,7 +930,7 @@ static int __init input_init(void)
{
int err;
- err = class_register(&input_dev_class);
+ err = class_register(&input_class);
if (err) {
printk(KERN_ERR "input: unable to register input_dev class\n");
return err;
@@ -949,7 +949,7 @@ static int __init input_init(void)
return 0;
fail2: input_proc_exit();
- fail1: class_unregister(&input_dev_class);
+ fail1: class_unregister(&input_class);
return err;
}
@@ -957,7 +957,7 @@ static void __exit input_exit(void)
{
input_proc_exit();
unregister_chrdev(INPUT_MAJOR, "input");
- class_unregister(&input_dev_class);
+ class_unregister(&input_class);
}
subsys_initcall(input_init);