diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2005-10-28 01:25:43 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-10-28 12:52:54 -0400 |
commit | 967ca692161d8c4e894932599592af8d62c0a895 (patch) | |
tree | d1cb14bddd9484c0f9e58e9dd52881f172e235b9 /drivers/input/mousedev.c | |
parent | 23d50901617c2a8bdef509279a42d2e90f523db9 (diff) |
[PATCH] INPUT: move the input class devices under their new input_dev devices
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/input/mousedev.c')
-rw-r--r-- | drivers/input/mousedev.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/input/mousedev.c b/drivers/input/mousedev.c index 89c3e496f1ed..5ec6291e967f 100644 --- a/drivers/input/mousedev.c +++ b/drivers/input/mousedev.c | |||
@@ -648,9 +648,9 @@ static struct input_handle *mousedev_connect(struct input_handler *handler, stru | |||
648 | 648 | ||
649 | mousedev_table[minor] = mousedev; | 649 | mousedev_table[minor] = mousedev; |
650 | 650 | ||
651 | class_device_create(input_class, NULL, | 651 | class_device_create(&input_dev_class, &dev->cdev, |
652 | MKDEV(INPUT_MAJOR, MOUSEDEV_MINOR_BASE + minor), | 652 | MKDEV(INPUT_MAJOR, MOUSEDEV_MINOR_BASE + minor), |
653 | dev->dev, "mouse%d", minor); | 653 | dev->cdev.dev, "mouse%d", minor); |
654 | 654 | ||
655 | return &mousedev->handle; | 655 | return &mousedev->handle; |
656 | } | 656 | } |
@@ -660,7 +660,7 @@ static void mousedev_disconnect(struct input_handle *handle) | |||
660 | struct mousedev *mousedev = handle->private; | 660 | struct mousedev *mousedev = handle->private; |
661 | struct mousedev_list *list; | 661 | struct mousedev_list *list; |
662 | 662 | ||
663 | class_device_destroy(input_class, | 663 | class_device_destroy(&input_dev_class, |
664 | MKDEV(INPUT_MAJOR, MOUSEDEV_MINOR_BASE + mousedev->minor)); | 664 | MKDEV(INPUT_MAJOR, MOUSEDEV_MINOR_BASE + mousedev->minor)); |
665 | mousedev->exist = 0; | 665 | mousedev->exist = 0; |
666 | 666 | ||
@@ -734,7 +734,7 @@ static int __init mousedev_init(void) | |||
734 | mousedev_mix.exist = 1; | 734 | mousedev_mix.exist = 1; |
735 | mousedev_mix.minor = MOUSEDEV_MIX; | 735 | mousedev_mix.minor = MOUSEDEV_MIX; |
736 | 736 | ||
737 | class_device_create(input_class, NULL, | 737 | class_device_create(&input_dev_class, NULL, |
738 | MKDEV(INPUT_MAJOR, MOUSEDEV_MINOR_BASE + MOUSEDEV_MIX), NULL, "mice"); | 738 | MKDEV(INPUT_MAJOR, MOUSEDEV_MINOR_BASE + MOUSEDEV_MIX), NULL, "mice"); |
739 | 739 | ||
740 | #ifdef CONFIG_INPUT_MOUSEDEV_PSAUX | 740 | #ifdef CONFIG_INPUT_MOUSEDEV_PSAUX |
@@ -753,7 +753,7 @@ static void __exit mousedev_exit(void) | |||
753 | if (psaux_registered) | 753 | if (psaux_registered) |
754 | misc_deregister(&psaux_mouse); | 754 | misc_deregister(&psaux_mouse); |
755 | #endif | 755 | #endif |
756 | class_device_destroy(input_class, | 756 | class_device_destroy(&input_dev_class, |
757 | MKDEV(INPUT_MAJOR, MOUSEDEV_MINOR_BASE + MOUSEDEV_MIX)); | 757 | MKDEV(INPUT_MAJOR, MOUSEDEV_MINOR_BASE + MOUSEDEV_MIX)); |
758 | input_unregister_handler(&mousedev_handler); | 758 | input_unregister_handler(&mousedev_handler); |
759 | } | 759 | } |