diff options
Diffstat (limited to 'drivers/char/lp.c')
| -rw-r--r-- | drivers/char/lp.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/char/lp.c b/drivers/char/lp.c index e57260525293..b11a390581ba 100644 --- a/drivers/char/lp.c +++ b/drivers/char/lp.c | |||
| @@ -120,7 +120,6 @@ | |||
| 120 | #include <linux/major.h> | 120 | #include <linux/major.h> |
| 121 | #include <linux/sched.h> | 121 | #include <linux/sched.h> |
| 122 | #include <linux/smp_lock.h> | 122 | #include <linux/smp_lock.h> |
| 123 | #include <linux/devfs_fs_kernel.h> | ||
| 124 | #include <linux/slab.h> | 123 | #include <linux/slab.h> |
| 125 | #include <linux/fcntl.h> | 124 | #include <linux/fcntl.h> |
| 126 | #include <linux/delay.h> | 125 | #include <linux/delay.h> |
| @@ -807,8 +806,6 @@ static int lp_register(int nr, struct parport *port) | |||
| 807 | 806 | ||
| 808 | class_device_create(lp_class, NULL, MKDEV(LP_MAJOR, nr), NULL, | 807 | class_device_create(lp_class, NULL, MKDEV(LP_MAJOR, nr), NULL, |
| 809 | "lp%d", nr); | 808 | "lp%d", nr); |
| 810 | devfs_mk_cdev(MKDEV(LP_MAJOR, nr), S_IFCHR | S_IRUGO | S_IWUGO, | ||
| 811 | "printers/%d", nr); | ||
| 812 | 809 | ||
| 813 | printk(KERN_INFO "lp%d: using %s (%s).\n", nr, port->name, | 810 | printk(KERN_INFO "lp%d: using %s (%s).\n", nr, port->name, |
| 814 | (port->irq == PARPORT_IRQ_NONE)?"polling":"interrupt-driven"); | 811 | (port->irq == PARPORT_IRQ_NONE)?"polling":"interrupt-driven"); |
| @@ -907,7 +904,6 @@ static int __init lp_init (void) | |||
| 907 | return -EIO; | 904 | return -EIO; |
| 908 | } | 905 | } |
| 909 | 906 | ||
| 910 | devfs_mk_dir("printers"); | ||
| 911 | lp_class = class_create(THIS_MODULE, "printer"); | 907 | lp_class = class_create(THIS_MODULE, "printer"); |
| 912 | if (IS_ERR(lp_class)) { | 908 | if (IS_ERR(lp_class)) { |
| 913 | err = PTR_ERR(lp_class); | 909 | err = PTR_ERR(lp_class); |
| @@ -933,7 +929,6 @@ static int __init lp_init (void) | |||
| 933 | out_class: | 929 | out_class: |
| 934 | class_destroy(lp_class); | 930 | class_destroy(lp_class); |
| 935 | out_devfs: | 931 | out_devfs: |
| 936 | devfs_remove("printers"); | ||
| 937 | unregister_chrdev(LP_MAJOR, "lp"); | 932 | unregister_chrdev(LP_MAJOR, "lp"); |
| 938 | return err; | 933 | return err; |
| 939 | } | 934 | } |
| @@ -981,10 +976,8 @@ static void lp_cleanup_module (void) | |||
| 981 | if (lp_table[offset].dev == NULL) | 976 | if (lp_table[offset].dev == NULL) |
| 982 | continue; | 977 | continue; |
| 983 | parport_unregister_device(lp_table[offset].dev); | 978 | parport_unregister_device(lp_table[offset].dev); |
| 984 | devfs_remove("printers/%d", offset); | ||
| 985 | class_device_destroy(lp_class, MKDEV(LP_MAJOR, offset)); | 979 | class_device_destroy(lp_class, MKDEV(LP_MAJOR, offset)); |
| 986 | } | 980 | } |
| 987 | devfs_remove("printers"); | ||
| 988 | class_destroy(lp_class); | 981 | class_destroy(lp_class); |
| 989 | } | 982 | } |
| 990 | 983 | ||
