aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/sg.c
diff options
context:
space:
mode:
authorGreg KH <gregkh@suse.de>2006-01-18 19:17:46 -0500
committer <jejb@mulgrave.il.steeleye.com>2006-02-27 23:55:04 -0500
commit5e3c34c1e988a0dfe177c38cf324e8e321c55ef5 (patch)
tree812e95ccda5860a16fe3f53343499d2c607cbf23 /drivers/scsi/sg.c
parentc67a848c3587296fe9794c95d1be7109c4c85461 (diff)
[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>
Diffstat (limited to 'drivers/scsi/sg.c')
-rw-r--r--drivers/scsi/sg.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
index ecf2f6010e76..06fc8ed720fc 100644
--- a/drivers/scsi/sg.c
+++ b/drivers/scsi/sg.c
@@ -44,7 +44,6 @@ static int sg_version_num = 30533; /* 2 digits for each component */
44#include <linux/poll.h> 44#include <linux/poll.h>
45#include <linux/smp_lock.h> 45#include <linux/smp_lock.h>
46#include <linux/moduleparam.h> 46#include <linux/moduleparam.h>
47#include <linux/devfs_fs_kernel.h>
48#include <linux/cdev.h> 47#include <linux/cdev.h>
49#include <linux/seq_file.h> 48#include <linux/seq_file.h>
50#include <linux/blkdev.h> 49#include <linux/blkdev.h>
@@ -1456,14 +1455,10 @@ sg_add(struct class_device *cl_dev, struct class_interface *cl_intf)
1456 k = error; 1455 k = error;
1457 sdp = sg_dev_arr[k]; 1456 sdp = sg_dev_arr[k];
1458 1457
1459 devfs_mk_cdev(MKDEV(SCSI_GENERIC_MAJOR, k),
1460 S_IFCHR | S_IRUSR | S_IWUSR | S_IRGRP,
1461 "%s/generic", scsidp->devfs_name);
1462 error = cdev_add(cdev, MKDEV(SCSI_GENERIC_MAJOR, k), 1); 1458 error = cdev_add(cdev, MKDEV(SCSI_GENERIC_MAJOR, k), 1);
1463 if (error) { 1459 if (error)
1464 devfs_remove("%s/generic", scsidp->devfs_name);
1465 goto out; 1460 goto out;
1466 } 1461
1467 sdp->cdev = cdev; 1462 sdp->cdev = cdev;
1468 if (sg_sysfs_valid) { 1463 if (sg_sysfs_valid) {
1469 struct class_device * sg_class_member; 1464 struct class_device * sg_class_member;
@@ -1553,7 +1548,6 @@ sg_remove(struct class_device *cl_dev, struct class_interface *cl_intf)
1553 class_device_destroy(sg_sysfs_class, MKDEV(SCSI_GENERIC_MAJOR, k)); 1548 class_device_destroy(sg_sysfs_class, MKDEV(SCSI_GENERIC_MAJOR, k));
1554 cdev_del(sdp->cdev); 1549 cdev_del(sdp->cdev);
1555 sdp->cdev = NULL; 1550 sdp->cdev = NULL;
1556 devfs_remove("%s/generic", scsidp->devfs_name);
1557 put_disk(sdp->disk); 1551 put_disk(sdp->disk);
1558 sdp->disk = NULL; 1552 sdp->disk = NULL;
1559 if (NULL == sdp->headfp) 1553 if (NULL == sdp->headfp)