diff options
Diffstat (limited to 'drivers/char/istallion.c')
-rw-r--r-- | drivers/char/istallion.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/drivers/char/istallion.c b/drivers/char/istallion.c index 216c79256de3..c74e5660a9b7 100644 --- a/drivers/char/istallion.c +++ b/drivers/char/istallion.c | |||
@@ -39,7 +39,6 @@ | |||
39 | #include <linux/ioport.h> | 39 | #include <linux/ioport.h> |
40 | #include <linux/delay.h> | 40 | #include <linux/delay.h> |
41 | #include <linux/init.h> | 41 | #include <linux/init.h> |
42 | #include <linux/devfs_fs_kernel.h> | ||
43 | #include <linux/device.h> | 42 | #include <linux/device.h> |
44 | #include <linux/wait.h> | 43 | #include <linux/wait.h> |
45 | #include <linux/eisa.h> | 44 | #include <linux/eisa.h> |
@@ -826,11 +825,8 @@ static void __exit istallion_module_exit(void) | |||
826 | return; | 825 | return; |
827 | } | 826 | } |
828 | put_tty_driver(stli_serial); | 827 | put_tty_driver(stli_serial); |
829 | for (i = 0; i < 4; i++) { | 828 | for (i = 0; i < 4; i++) |
830 | devfs_remove("staliomem/%d", i); | ||
831 | class_device_destroy(istallion_class, MKDEV(STL_SIOMEMMAJOR, i)); | 829 | class_device_destroy(istallion_class, MKDEV(STL_SIOMEMMAJOR, i)); |
832 | } | ||
833 | devfs_remove("staliomem"); | ||
834 | class_destroy(istallion_class); | 830 | class_destroy(istallion_class); |
835 | if ((i = unregister_chrdev(STL_SIOMEMMAJOR, "staliomem"))) | 831 | if ((i = unregister_chrdev(STL_SIOMEMMAJOR, "staliomem"))) |
836 | printk("STALLION: failed to un-register serial memory device, " | 832 | printk("STALLION: failed to un-register serial memory device, " |
@@ -4728,16 +4724,11 @@ int __init stli_init(void) | |||
4728 | printk(KERN_ERR "STALLION: failed to register serial memory " | 4724 | printk(KERN_ERR "STALLION: failed to register serial memory " |
4729 | "device\n"); | 4725 | "device\n"); |
4730 | 4726 | ||
4731 | devfs_mk_dir("staliomem"); | ||
4732 | istallion_class = class_create(THIS_MODULE, "staliomem"); | 4727 | istallion_class = class_create(THIS_MODULE, "staliomem"); |
4733 | for (i = 0; i < 4; i++) { | 4728 | for (i = 0; i < 4; i++) |
4734 | devfs_mk_cdev(MKDEV(STL_SIOMEMMAJOR, i), | ||
4735 | S_IFCHR | S_IRUSR | S_IWUSR, | ||
4736 | "staliomem/%d", i); | ||
4737 | class_device_create(istallion_class, NULL, | 4729 | class_device_create(istallion_class, NULL, |
4738 | MKDEV(STL_SIOMEMMAJOR, i), | 4730 | MKDEV(STL_SIOMEMMAJOR, i), |
4739 | NULL, "staliomem%d", i); | 4731 | NULL, "staliomem%d", i); |
4740 | } | ||
4741 | 4732 | ||
4742 | /* | 4733 | /* |
4743 | * Set up the tty driver structure and register us as a driver. | 4734 | * Set up the tty driver structure and register us as a driver. |