diff options
Diffstat (limited to 'drivers/input/mousedev.c')
-rw-r--r-- | drivers/input/mousedev.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/input/mousedev.c b/drivers/input/mousedev.c index d7144e1a9ae3..89c3e496f1ed 100644 --- a/drivers/input/mousedev.c +++ b/drivers/input/mousedev.c | |||
@@ -9,7 +9,7 @@ | |||
9 | * the Free Software Foundation. | 9 | * the Free Software Foundation. |
10 | */ | 10 | */ |
11 | 11 | ||
12 | #define MOUSEDEV_MINOR_BASE 32 | 12 | #define MOUSEDEV_MINOR_BASE 32 |
13 | #define MOUSEDEV_MINORS 32 | 13 | #define MOUSEDEV_MINORS 32 |
14 | #define MOUSEDEV_MIX 31 | 14 | #define MOUSEDEV_MIX 31 |
15 | 15 | ||
@@ -24,7 +24,6 @@ | |||
24 | #include <linux/random.h> | 24 | #include <linux/random.h> |
25 | #include <linux/major.h> | 25 | #include <linux/major.h> |
26 | #include <linux/device.h> | 26 | #include <linux/device.h> |
27 | #include <linux/devfs_fs_kernel.h> | ||
28 | #ifdef CONFIG_INPUT_MOUSEDEV_PSAUX | 27 | #ifdef CONFIG_INPUT_MOUSEDEV_PSAUX |
29 | #include <linux/miscdevice.h> | 28 | #include <linux/miscdevice.h> |
30 | #endif | 29 | #endif |
@@ -649,8 +648,6 @@ static struct input_handle *mousedev_connect(struct input_handler *handler, stru | |||
649 | 648 | ||
650 | mousedev_table[minor] = mousedev; | 649 | mousedev_table[minor] = mousedev; |
651 | 650 | ||
652 | devfs_mk_cdev(MKDEV(INPUT_MAJOR, MOUSEDEV_MINOR_BASE + minor), | ||
653 | S_IFCHR|S_IRUGO|S_IWUSR, "input/mouse%d", minor); | ||
654 | class_device_create(input_class, NULL, | 651 | class_device_create(input_class, NULL, |
655 | MKDEV(INPUT_MAJOR, MOUSEDEV_MINOR_BASE + minor), | 652 | MKDEV(INPUT_MAJOR, MOUSEDEV_MINOR_BASE + minor), |
656 | dev->dev, "mouse%d", minor); | 653 | dev->dev, "mouse%d", minor); |
@@ -665,7 +662,6 @@ static void mousedev_disconnect(struct input_handle *handle) | |||
665 | 662 | ||
666 | class_device_destroy(input_class, | 663 | class_device_destroy(input_class, |
667 | MKDEV(INPUT_MAJOR, MOUSEDEV_MINOR_BASE + mousedev->minor)); | 664 | MKDEV(INPUT_MAJOR, MOUSEDEV_MINOR_BASE + mousedev->minor)); |
668 | devfs_remove("input/mouse%d", mousedev->minor); | ||
669 | mousedev->exist = 0; | 665 | mousedev->exist = 0; |
670 | 666 | ||
671 | if (mousedev->open) { | 667 | if (mousedev->open) { |
@@ -738,8 +734,6 @@ static int __init mousedev_init(void) | |||
738 | mousedev_mix.exist = 1; | 734 | mousedev_mix.exist = 1; |
739 | mousedev_mix.minor = MOUSEDEV_MIX; | 735 | mousedev_mix.minor = MOUSEDEV_MIX; |
740 | 736 | ||
741 | devfs_mk_cdev(MKDEV(INPUT_MAJOR, MOUSEDEV_MINOR_BASE + MOUSEDEV_MIX), | ||
742 | S_IFCHR|S_IRUGO|S_IWUSR, "input/mice"); | ||
743 | class_device_create(input_class, NULL, | 737 | class_device_create(input_class, NULL, |
744 | MKDEV(INPUT_MAJOR, MOUSEDEV_MINOR_BASE + MOUSEDEV_MIX), NULL, "mice"); | 738 | MKDEV(INPUT_MAJOR, MOUSEDEV_MINOR_BASE + MOUSEDEV_MIX), NULL, "mice"); |
745 | 739 | ||
@@ -759,7 +753,6 @@ static void __exit mousedev_exit(void) | |||
759 | if (psaux_registered) | 753 | if (psaux_registered) |
760 | misc_deregister(&psaux_mouse); | 754 | misc_deregister(&psaux_mouse); |
761 | #endif | 755 | #endif |
762 | devfs_remove("input/mice"); | ||
763 | class_device_destroy(input_class, | 756 | class_device_destroy(input_class, |
764 | MKDEV(INPUT_MAJOR, MOUSEDEV_MINOR_BASE + MOUSEDEV_MIX)); | 757 | MKDEV(INPUT_MAJOR, MOUSEDEV_MINOR_BASE + MOUSEDEV_MIX)); |
765 | input_unregister_handler(&mousedev_handler); | 758 | input_unregister_handler(&mousedev_handler); |