浏览代码

[SCSI] git-scsi-misc: drivers/scsi/ch.c: remove devfs stuff

It seems very unlikely that this driver will go into any stable kernel
before devfs will be removed.

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Cc: James Bottomley <James.Bottomley@steeleye.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Adrian Bunk 20 年之前
父节点
当前提交
5dbffcd83d
共有 1 个文件被更改,包括 0 次插入4 次删除
  1. 0 4
      drivers/scsi/ch.c

+ 0 - 4
drivers/scsi/ch.c

@@ -20,7 +20,6 @@
 #include <linux/interrupt.h>
 #include <linux/interrupt.h>
 #include <linux/blkdev.h>
 #include <linux/blkdev.h>
 #include <linux/completion.h>
 #include <linux/completion.h>
-#include <linux/devfs_fs_kernel.h>
 #include <linux/ioctl32.h>
 #include <linux/ioctl32.h>
 #include <linux/compat.h>
 #include <linux/compat.h>
 #include <linux/chio.h>			/* here are all the ioctls */
 #include <linux/chio.h>			/* here are all the ioctls */
@@ -940,8 +939,6 @@ static int ch_probe(struct device *dev)
 	if (init)
 	if (init)
 		ch_init_elem(ch);
 		ch_init_elem(ch);
 
 
-	devfs_mk_cdev(MKDEV(SCSI_CHANGER_MAJOR,ch->minor),
-		      S_IFCHR | S_IRUGO | S_IWUGO, ch->name);
 	class_device_create(ch_sysfs_class,
 	class_device_create(ch_sysfs_class,
 			    MKDEV(SCSI_CHANGER_MAJOR,ch->minor),
 			    MKDEV(SCSI_CHANGER_MAJOR,ch->minor),
 			    dev, "s%s", ch->name);
 			    dev, "s%s", ch->name);
@@ -974,7 +971,6 @@ static int ch_remove(struct device *dev)
 
 
 	class_device_destroy(ch_sysfs_class,
 	class_device_destroy(ch_sysfs_class,
 			     MKDEV(SCSI_CHANGER_MAJOR,ch->minor));
 			     MKDEV(SCSI_CHANGER_MAJOR,ch->minor));
-	devfs_remove(ch->name);
 	kfree(ch->dt);
 	kfree(ch->dt);
 	kfree(ch);
 	kfree(ch);
 	ch_devcount--;
 	ch_devcount--;