[SCSI] Remove devfs support from the SCSI subsystem

As devfs has been disabled from the kernel tree for a number of months
now (5 to be exact), here's a patch against 2.6.16-rc1-git1 that removes
support for it from the SCSI subsystem.

The patch also removes the scsi_disk devfs_name field as it's no longer
needed.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

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";
 #include <linux/spinlock.h>
 #include <linux/blkdev.h>
 #include <linux/moduleparam.h>
-#include <linux/devfs_fs_kernel.h>
 #include <linux/cdev.h>
 #include <linux/delay.h>
 #include <linux/mutex.h>
@@ -4053,21 +4052,6 @@ static int st_probe(struct device *dev)
                 do_create_class_files(tpnt, dev_num, mode);
         }
 
-        for (mode = 0; mode < ST_NBR_MODES; ++mode) {
-                /* Make sure that the minor numbers corresponding to the four
-                   first modes always get the same names */
-                i = mode << (4 - ST_NBR_MODE_BITS);
-                /*  Rewind entry  */
-                devfs_mk_cdev(MKDEV(SCSI_TAPE_MAJOR, TAPE_MINOR(dev_num, mode, 0)),
-                              S_IFCHR | S_IRUGO | S_IWUGO,
-                              "%s/mt%s", SDp->devfs_name, st_formats[i]);
-                /*  No-rewind entry  */
-                devfs_mk_cdev(MKDEV(SCSI_TAPE_MAJOR, TAPE_MINOR(dev_num, mode, 1)),
-                              S_IFCHR | S_IRUGO | S_IWUGO,
-                              "%s/mt%sn", SDp->devfs_name, st_formats[i]);
-        }
-        disk->number = devfs_register_tape(SDp->devfs_name);
-
         sdev_printk(KERN_WARNING, SDp,
                     "Attached scsi tape %s", tape_name(tpnt));
         printk(KERN_WARNING "%s: try direct i/o: %s (alignment %d B)\n",
@@ -4121,13 +4105,9 @@ static int st_remove(struct device *dev)
                         scsi_tapes[i] = NULL;
                         st_nr_dev--;
                         write_unlock(&st_dev_arr_lock);
-                        devfs_unregister_tape(tpnt->disk->number);
                         sysfs_remove_link(&tpnt->device->sdev_gendev.kobj,
                                           "tape");
                         for (mode = 0; mode < ST_NBR_MODES; ++mode) {
-                                j = mode << (4 - ST_NBR_MODE_BITS);
-                                devfs_remove("%s/mt%s", SDp->devfs_name, st_formats[j]);
-                                devfs_remove("%s/mt%sn", SDp->devfs_name, st_formats[j]);
                                 for (j=0; j < 2; j++) {
                                         class_device_destroy(st_sysfs_class,
                                                              MKDEV(SCSI_TAPE_MAJOR,