diff options
Diffstat (limited to 'drivers/scsi/st.c')
-rw-r--r-- | drivers/scsi/st.c | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c index f0606da19d02..31c6eefba9d6 100644 --- a/drivers/scsi/st.c +++ b/drivers/scsi/st.c | |||
@@ -35,7 +35,6 @@ static const char *verstr = "20050830"; | |||
35 | #include <linux/spinlock.h> | 35 | #include <linux/spinlock.h> |
36 | #include <linux/blkdev.h> | 36 | #include <linux/blkdev.h> |
37 | #include <linux/moduleparam.h> | 37 | #include <linux/moduleparam.h> |
38 | #include <linux/devfs_fs_kernel.h> | ||
39 | #include <linux/cdev.h> | 38 | #include <linux/cdev.h> |
40 | #include <linux/delay.h> | 39 | #include <linux/delay.h> |
41 | #include <linux/mutex.h> | 40 | #include <linux/mutex.h> |
@@ -4053,21 +4052,6 @@ static int st_probe(struct device *dev) | |||
4053 | do_create_class_files(tpnt, dev_num, mode); | 4052 | do_create_class_files(tpnt, dev_num, mode); |
4054 | } | 4053 | } |
4055 | 4054 | ||
4056 | for (mode = 0; mode < ST_NBR_MODES; ++mode) { | ||
4057 | /* Make sure that the minor numbers corresponding to the four | ||
4058 | first modes always get the same names */ | ||
4059 | i = mode << (4 - ST_NBR_MODE_BITS); | ||
4060 | /* Rewind entry */ | ||
4061 | devfs_mk_cdev(MKDEV(SCSI_TAPE_MAJOR, TAPE_MINOR(dev_num, mode, 0)), | ||
4062 | S_IFCHR | S_IRUGO | S_IWUGO, | ||
4063 | "%s/mt%s", SDp->devfs_name, st_formats[i]); | ||
4064 | /* No-rewind entry */ | ||
4065 | devfs_mk_cdev(MKDEV(SCSI_TAPE_MAJOR, TAPE_MINOR(dev_num, mode, 1)), | ||
4066 | S_IFCHR | S_IRUGO | S_IWUGO, | ||
4067 | "%s/mt%sn", SDp->devfs_name, st_formats[i]); | ||
4068 | } | ||
4069 | disk->number = devfs_register_tape(SDp->devfs_name); | ||
4070 | |||
4071 | sdev_printk(KERN_WARNING, SDp, | 4055 | sdev_printk(KERN_WARNING, SDp, |
4072 | "Attached scsi tape %s", tape_name(tpnt)); | 4056 | "Attached scsi tape %s", tape_name(tpnt)); |
4073 | printk(KERN_WARNING "%s: try direct i/o: %s (alignment %d B)\n", | 4057 | printk(KERN_WARNING "%s: try direct i/o: %s (alignment %d B)\n", |
@@ -4121,13 +4105,9 @@ static int st_remove(struct device *dev) | |||
4121 | scsi_tapes[i] = NULL; | 4105 | scsi_tapes[i] = NULL; |
4122 | st_nr_dev--; | 4106 | st_nr_dev--; |
4123 | write_unlock(&st_dev_arr_lock); | 4107 | write_unlock(&st_dev_arr_lock); |
4124 | devfs_unregister_tape(tpnt->disk->number); | ||
4125 | sysfs_remove_link(&tpnt->device->sdev_gendev.kobj, | 4108 | sysfs_remove_link(&tpnt->device->sdev_gendev.kobj, |
4126 | "tape"); | 4109 | "tape"); |
4127 | for (mode = 0; mode < ST_NBR_MODES; ++mode) { | 4110 | for (mode = 0; mode < ST_NBR_MODES; ++mode) { |
4128 | j = mode << (4 - ST_NBR_MODE_BITS); | ||
4129 | devfs_remove("%s/mt%s", SDp->devfs_name, st_formats[j]); | ||
4130 | devfs_remove("%s/mt%sn", SDp->devfs_name, st_formats[j]); | ||
4131 | for (j=0; j < 2; j++) { | 4111 | for (j=0; j < 2; j++) { |
4132 | class_device_destroy(st_sysfs_class, | 4112 | class_device_destroy(st_sysfs_class, |
4133 | MKDEV(SCSI_TAPE_MAJOR, | 4113 | MKDEV(SCSI_TAPE_MAJOR, |