diff options
Diffstat (limited to 'drivers/ieee1394/raw1394.c')
-rw-r--r-- | drivers/ieee1394/raw1394.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/ieee1394/raw1394.c b/drivers/ieee1394/raw1394.c index 19f26c5c9479..f7de546f2ed6 100644 --- a/drivers/ieee1394/raw1394.c +++ b/drivers/ieee1394/raw1394.c | |||
@@ -41,7 +41,6 @@ | |||
41 | #include <linux/cdev.h> | 41 | #include <linux/cdev.h> |
42 | #include <asm/uaccess.h> | 42 | #include <asm/uaccess.h> |
43 | #include <asm/atomic.h> | 43 | #include <asm/atomic.h> |
44 | #include <linux/devfs_fs_kernel.h> | ||
45 | #include <linux/compat.h> | 44 | #include <linux/compat.h> |
46 | 45 | ||
47 | #include "csr1212.h" | 46 | #include "csr1212.h" |
@@ -2999,9 +2998,6 @@ static int __init init_raw1394(void) | |||
2999 | goto out_unreg; | 2998 | goto out_unreg; |
3000 | } | 2999 | } |
3001 | 3000 | ||
3002 | devfs_mk_cdev(MKDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_RAW1394 * 16), | ||
3003 | S_IFCHR | S_IRUSR | S_IWUSR, RAW1394_DEVICE_NAME); | ||
3004 | |||
3005 | cdev_init(&raw1394_cdev, &raw1394_fops); | 3001 | cdev_init(&raw1394_cdev, &raw1394_fops); |
3006 | raw1394_cdev.owner = THIS_MODULE; | 3002 | raw1394_cdev.owner = THIS_MODULE; |
3007 | kobject_set_name(&raw1394_cdev.kobj, RAW1394_DEVICE_NAME); | 3003 | kobject_set_name(&raw1394_cdev.kobj, RAW1394_DEVICE_NAME); |
@@ -3023,7 +3019,6 @@ static int __init init_raw1394(void) | |||
3023 | goto out; | 3019 | goto out; |
3024 | 3020 | ||
3025 | out_dev: | 3021 | out_dev: |
3026 | devfs_remove(RAW1394_DEVICE_NAME); | ||
3027 | class_device_destroy(hpsb_protocol_class, | 3022 | class_device_destroy(hpsb_protocol_class, |
3028 | MKDEV(IEEE1394_MAJOR, | 3023 | MKDEV(IEEE1394_MAJOR, |
3029 | IEEE1394_MINOR_BLOCK_RAW1394 * 16)); | 3024 | IEEE1394_MINOR_BLOCK_RAW1394 * 16)); |
@@ -3039,7 +3034,6 @@ static void __exit cleanup_raw1394(void) | |||
3039 | MKDEV(IEEE1394_MAJOR, | 3034 | MKDEV(IEEE1394_MAJOR, |
3040 | IEEE1394_MINOR_BLOCK_RAW1394 * 16)); | 3035 | IEEE1394_MINOR_BLOCK_RAW1394 * 16)); |
3041 | cdev_del(&raw1394_cdev); | 3036 | cdev_del(&raw1394_cdev); |
3042 | devfs_remove(RAW1394_DEVICE_NAME); | ||
3043 | hpsb_unregister_highlevel(&raw1394_highlevel); | 3037 | hpsb_unregister_highlevel(&raw1394_highlevel); |
3044 | hpsb_unregister_protocol(&raw1394_driver); | 3038 | hpsb_unregister_protocol(&raw1394_driver); |
3045 | } | 3039 | } |