aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/input/evdev.c4
-rw-r--r--drivers/input/input.c7
-rw-r--r--drivers/input/joydev.c4
-rw-r--r--drivers/input/mousedev.c9
-rw-r--r--drivers/input/tsdev.c7
5 files changed, 1 insertions, 30 deletions
diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c
index 83b694cb8507..14ea57f963bb 100644
--- a/drivers/input/evdev.c
+++ b/drivers/input/evdev.c
@@ -20,7 +20,6 @@
20#include <linux/major.h> 20#include <linux/major.h>
21#include <linux/smp_lock.h> 21#include <linux/smp_lock.h>
22#include <linux/device.h> 22#include <linux/device.h>
23#include <linux/devfs_fs_kernel.h>
24#include <linux/compat.h> 23#include <linux/compat.h>
25 24
26struct evdev { 25struct evdev {
@@ -687,8 +686,6 @@ static struct input_handle *evdev_connect(struct input_handler *handler, struct
687 686
688 evdev_table[minor] = evdev; 687 evdev_table[minor] = evdev;
689 688
690 devfs_mk_cdev(MKDEV(INPUT_MAJOR, EVDEV_MINOR_BASE + minor),
691 S_IFCHR|S_IRUGO|S_IWUSR, "input/event%d", minor);
692 class_device_create(input_class, NULL, 689 class_device_create(input_class, NULL,
693 MKDEV(INPUT_MAJOR, EVDEV_MINOR_BASE + minor), 690 MKDEV(INPUT_MAJOR, EVDEV_MINOR_BASE + minor),
694 dev->dev, "event%d", minor); 691 dev->dev, "event%d", minor);
@@ -703,7 +700,6 @@ static void evdev_disconnect(struct input_handle *handle)
703 700
704 class_device_destroy(input_class, 701 class_device_destroy(input_class,
705 MKDEV(INPUT_MAJOR, EVDEV_MINOR_BASE + evdev->minor)); 702 MKDEV(INPUT_MAJOR, EVDEV_MINOR_BASE + evdev->minor));
706 devfs_remove("input/event%d", evdev->minor);
707 evdev->exist = 0; 703 evdev->exist = 0;
708 704
709 if (evdev->open) { 705 if (evdev->open) {
diff --git a/drivers/input/input.c b/drivers/input/input.c
index 14ae5583e198..072bbf528151 100644
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -22,7 +22,6 @@
22#include <linux/interrupt.h> 22#include <linux/interrupt.h>
23#include <linux/poll.h> 23#include <linux/poll.h>
24#include <linux/device.h> 24#include <linux/device.h>
25#include <linux/devfs_fs_kernel.h>
26 25
27MODULE_AUTHOR("Vojtech Pavlik <vojtech@suse.cz>"); 26MODULE_AUTHOR("Vojtech Pavlik <vojtech@suse.cz>");
28MODULE_DESCRIPTION("Input core"); 27MODULE_DESCRIPTION("Input core");
@@ -770,13 +769,8 @@ static int __init input_init(void)
770 goto fail2; 769 goto fail2;
771 } 770 }
772 771
773 err = devfs_mk_dir("input");
774 if (err)
775 goto fail3;
776
777 return 0; 772 return 0;
778 773
779 fail3: unregister_chrdev(INPUT_MAJOR, "input");
780 fail2: input_proc_exit(); 774 fail2: input_proc_exit();
781 fail1: class_destroy(input_class); 775 fail1: class_destroy(input_class);
782 return err; 776 return err;
@@ -785,7 +779,6 @@ static int __init input_init(void)
785static void __exit input_exit(void) 779static void __exit input_exit(void)
786{ 780{
787 input_proc_exit(); 781 input_proc_exit();
788 devfs_remove("input");
789 unregister_chrdev(INPUT_MAJOR, "input"); 782 unregister_chrdev(INPUT_MAJOR, "input");
790 class_destroy(input_class); 783 class_destroy(input_class);
791} 784}
diff --git a/drivers/input/joydev.c b/drivers/input/joydev.c
index c696fb2a6f99..40d2b46cbc79 100644
--- a/drivers/input/joydev.c
+++ b/drivers/input/joydev.c
@@ -26,7 +26,6 @@
26#include <linux/init.h> 26#include <linux/init.h>
27#include <linux/smp_lock.h> 27#include <linux/smp_lock.h>
28#include <linux/device.h> 28#include <linux/device.h>
29#include <linux/devfs_fs_kernel.h>
30 29
31MODULE_AUTHOR("Vojtech Pavlik <vojtech@ucw.cz>"); 30MODULE_AUTHOR("Vojtech Pavlik <vojtech@ucw.cz>");
32MODULE_DESCRIPTION("Joystick device interfaces"); 31MODULE_DESCRIPTION("Joystick device interfaces");
@@ -514,8 +513,6 @@ static struct input_handle *joydev_connect(struct input_handler *handler, struct
514 513
515 joydev_table[minor] = joydev; 514 joydev_table[minor] = joydev;
516 515
517 devfs_mk_cdev(MKDEV(INPUT_MAJOR, JOYDEV_MINOR_BASE + minor),
518 S_IFCHR|S_IRUGO|S_IWUSR, "input/js%d", minor);
519 class_device_create(input_class, NULL, 516 class_device_create(input_class, NULL,
520 MKDEV(INPUT_MAJOR, JOYDEV_MINOR_BASE + minor), 517 MKDEV(INPUT_MAJOR, JOYDEV_MINOR_BASE + minor),
521 dev->dev, "js%d", minor); 518 dev->dev, "js%d", minor);
@@ -529,7 +526,6 @@ static void joydev_disconnect(struct input_handle *handle)
529 struct joydev_list *list; 526 struct joydev_list *list;
530 527
531 class_device_destroy(input_class, MKDEV(INPUT_MAJOR, JOYDEV_MINOR_BASE + joydev->minor)); 528 class_device_destroy(input_class, MKDEV(INPUT_MAJOR, JOYDEV_MINOR_BASE + joydev->minor));
532 devfs_remove("input/js%d", joydev->minor);
533 joydev->exist = 0; 529 joydev->exist = 0;
534 530
535 if (joydev->open) { 531 if (joydev->open) {
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);
diff --git a/drivers/input/tsdev.c b/drivers/input/tsdev.c
index fbb35c97551b..2d45e4df4163 100644
--- a/drivers/input/tsdev.c
+++ b/drivers/input/tsdev.c
@@ -53,7 +53,6 @@
53#include <linux/random.h> 53#include <linux/random.h>
54#include <linux/time.h> 54#include <linux/time.h>
55#include <linux/device.h> 55#include <linux/device.h>
56#include <linux/devfs_fs_kernel.h>
57 56
58#ifndef CONFIG_INPUT_TSDEV_SCREEN_X 57#ifndef CONFIG_INPUT_TSDEV_SCREEN_X
59#define CONFIG_INPUT_TSDEV_SCREEN_X 240 58#define CONFIG_INPUT_TSDEV_SCREEN_X 240
@@ -410,10 +409,6 @@ static struct input_handle *tsdev_connect(struct input_handler *handler,
410 409
411 tsdev_table[minor] = tsdev; 410 tsdev_table[minor] = tsdev;
412 411
413 devfs_mk_cdev(MKDEV(INPUT_MAJOR, TSDEV_MINOR_BASE + minor),
414 S_IFCHR|S_IRUGO|S_IWUSR, "input/ts%d", minor);
415 devfs_mk_cdev(MKDEV(INPUT_MAJOR, TSDEV_MINOR_BASE + minor + TSDEV_MINORS/2),
416 S_IFCHR|S_IRUGO|S_IWUSR, "input/tsraw%d", minor);
417 class_device_create(input_class, NULL, 412 class_device_create(input_class, NULL,
418 MKDEV(INPUT_MAJOR, TSDEV_MINOR_BASE + minor), 413 MKDEV(INPUT_MAJOR, TSDEV_MINOR_BASE + minor),
419 dev->dev, "ts%d", minor); 414 dev->dev, "ts%d", minor);
@@ -428,8 +423,6 @@ static void tsdev_disconnect(struct input_handle *handle)
428 423
429 class_device_destroy(input_class, 424 class_device_destroy(input_class,
430 MKDEV(INPUT_MAJOR, TSDEV_MINOR_BASE + tsdev->minor)); 425 MKDEV(INPUT_MAJOR, TSDEV_MINOR_BASE + tsdev->minor));
431 devfs_remove("input/ts%d", tsdev->minor);
432 devfs_remove("input/tsraw%d", tsdev->minor);
433 tsdev->exist = 0; 426 tsdev->exist = 0;
434 427
435 if (tsdev->open) { 428 if (tsdev->open) {