Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 4f00469c16b86a3dd6ed66b28c605c8430d58eeb

Authored by Dmitry Torokhov
Committed by Greg Kroah-Hartman
1 parent 74be227f72
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

[PATCH] Input: kill devfs references 

Input: remove references to devfs from input subsystem

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Showing 5 changed files with 1 additions and 30 deletions Side-by-side Diff

drivers/input/evdev.c
Diff comments   View file @ 4f00469
... ... @@ -20,7 +20,6 @@
20 20 #include <linux/major.h>
21 21 #include <linux/smp_lock.h>
22 22 #include <linux/device.h>
23   -#include <linux/devfs_fs_kernel.h>
24 23 #include <linux/compat.h>
25 24  
26 25 struct evdev {
... ... @@ -687,8 +686,6 @@
687 686  
688 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 689 class_device_create(input_class, NULL,
693 690 MKDEV(INPUT_MAJOR, EVDEV_MINOR_BASE + minor),
694 691 dev->dev, "event%d", minor);
... ... @@ -703,7 +700,6 @@
703 700  
704 701 class_device_destroy(input_class,
705 702 MKDEV(INPUT_MAJOR, EVDEV_MINOR_BASE + evdev->minor));
706   - devfs_remove("input/event%d", evdev->minor);
707 703 evdev->exist = 0;
708 704  
709 705 if (evdev->open) {
drivers/input/input.c
Diff comments   View file @ 4f00469
... ... @@ -22,7 +22,6 @@
22 22 #include <linux/interrupt.h>
23 23 #include <linux/poll.h>
24 24 #include <linux/device.h>
25   -#include <linux/devfs_fs_kernel.h>
26 25  
27 26 MODULE_AUTHOR("Vojtech Pavlik <vojtech@suse.cz>");
28 27 MODULE_DESCRIPTION("Input core");
29 28  
... ... @@ -770,13 +769,8 @@
770 769 goto fail2;
771 770 }
772 771  
773   - err = devfs_mk_dir("input");
774   - if (err)
775   - goto fail3;
776   -
777 772 return 0;
778 773  
779   - fail3: unregister_chrdev(INPUT_MAJOR, "input");
780 774 fail2: input_proc_exit();
781 775 fail1: class_destroy(input_class);
782 776 return err;
... ... @@ -785,7 +779,6 @@
785 779 static void __exit input_exit(void)
786 780 {
787 781 input_proc_exit();
788   - devfs_remove("input");
789 782 unregister_chrdev(INPUT_MAJOR, "input");
790 783 class_destroy(input_class);
791 784 }
drivers/input/joydev.c
Diff comments   View file @ 4f00469
... ... @@ -26,7 +26,6 @@
26 26 #include <linux/init.h>
27 27 #include <linux/smp_lock.h>
28 28 #include <linux/device.h>
29   -#include <linux/devfs_fs_kernel.h>
30 29  
31 30 MODULE_AUTHOR("Vojtech Pavlik <vojtech@ucw.cz>");
32 31 MODULE_DESCRIPTION("Joystick device interfaces");
... ... @@ -514,8 +513,6 @@
514 513  
515 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 516 class_device_create(input_class, NULL,
520 517 MKDEV(INPUT_MAJOR, JOYDEV_MINOR_BASE + minor),
521 518 dev->dev, "js%d", minor);
... ... @@ -529,7 +526,6 @@
529 526 struct joydev_list *list;
530 527  
531 528 class_device_destroy(input_class, MKDEV(INPUT_MAJOR, JOYDEV_MINOR_BASE + joydev->minor));
532   - devfs_remove("input/js%d", joydev->minor);
533 529 joydev->exist = 0;
534 530  
535 531 if (joydev->open) {
drivers/input/mousedev.c
Diff comments   View file @ 4f00469
... ... @@ -9,7 +9,7 @@
9 9 * the Free Software Foundation.
10 10 */
11 11  
12   -#define MOUSEDEV_MINOR_BASE 32
  12 +#define MOUSEDEV_MINOR_BASE 32
13 13 #define MOUSEDEV_MINORS 32
14 14 #define MOUSEDEV_MIX 31
15 15  
... ... @@ -24,7 +24,6 @@
24 24 #include <linux/random.h>
25 25 #include <linux/major.h>
26 26 #include <linux/device.h>
27   -#include <linux/devfs_fs_kernel.h>
28 27 #ifdef CONFIG_INPUT_MOUSEDEV_PSAUX
29 28 #include <linux/miscdevice.h>
30 29 #endif
... ... @@ -649,8 +648,6 @@
649 648  
650 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 651 class_device_create(input_class, NULL,
655 652 MKDEV(INPUT_MAJOR, MOUSEDEV_MINOR_BASE + minor),
656 653 dev->dev, "mouse%d", minor);
... ... @@ -665,7 +662,6 @@
665 662  
666 663 class_device_destroy(input_class,
667 664 MKDEV(INPUT_MAJOR, MOUSEDEV_MINOR_BASE + mousedev->minor));
668   - devfs_remove("input/mouse%d", mousedev->minor);
669 665 mousedev->exist = 0;
670 666  
671 667 if (mousedev->open) {
... ... @@ -738,8 +734,6 @@
738 734 mousedev_mix.exist = 1;
739 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 737 class_device_create(input_class, NULL,
744 738 MKDEV(INPUT_MAJOR, MOUSEDEV_MINOR_BASE + MOUSEDEV_MIX), NULL, "mice");
745 739  
... ... @@ -759,7 +753,6 @@
759 753 if (psaux_registered)
760 754 misc_deregister(&psaux_mouse);
761 755 #endif
762   - devfs_remove("input/mice");
763 756 class_device_destroy(input_class,
764 757 MKDEV(INPUT_MAJOR, MOUSEDEV_MINOR_BASE + MOUSEDEV_MIX));
765 758 input_unregister_handler(&mousedev_handler);
drivers/input/tsdev.c
Diff comments   View file @ 4f00469
... ... @@ -53,7 +53,6 @@
53 53 #include <linux/random.h>
54 54 #include <linux/time.h>
55 55 #include <linux/device.h>
56   -#include <linux/devfs_fs_kernel.h>
57 56  
58 57 #ifndef CONFIG_INPUT_TSDEV_SCREEN_X
59 58 #define CONFIG_INPUT_TSDEV_SCREEN_X 240
... ... @@ -410,10 +409,6 @@
410 409  
411 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 412 class_device_create(input_class, NULL,
418 413 MKDEV(INPUT_MAJOR, TSDEV_MINOR_BASE + minor),
419 414 dev->dev, "ts%d", minor);
... ... @@ -428,8 +423,6 @@
428 423  
429 424 class_device_destroy(input_class,
430 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 426 tsdev->exist = 0;
434 427  
435 428 if (tsdev->open) {