10 files changed, 0 insertions, 17 deletions

diff --git a/drivers/cdrom/aztcd.c b/drivers/cdrom/aztcd.c
index ec004897b634..ec469497c10f 100644
--- a/drivers/cdrom/aztcd.c
+++ b/drivers/cdrom/aztcd.c
@@ -1918,7 +1918,6 @@ static int __init aztcd_init(void)
         azt_disk->first_minor = 0;
         azt_disk->fops = &azt_fops;
         sprintf(azt_disk->disk_name, "aztcd");
-        sprintf(azt_disk->devfs_name, "aztcd");
         azt_disk->queue = azt_queue;
         add_disk(azt_disk);
         azt_invalidate_buffers();
diff --git a/drivers/cdrom/cdu31a.c b/drivers/cdrom/cdu31a.c
index 72ffd64e8b1e..5f0f2027f29e 100644
--- a/drivers/cdrom/cdu31a.c
+++ b/drivers/cdrom/cdu31a.c
@@ -161,7 +161,6 @@
 #include <linux/hdreg.h>
 #include <linux/genhd.h>
 #include <linux/ioport.h>
-#include <linux/devfs_fs_kernel.h>
 #include <linux/string.h>
 #include <linux/slab.h>
 #include <linux/init.h>
diff --git a/drivers/cdrom/cm206.c b/drivers/cdrom/cm206.c
index f43a988dd413..4ee288688fed 100644
--- a/drivers/cdrom/cm206.c
+++ b/drivers/cdrom/cm206.c
@@ -187,7 +187,6 @@ History:
 #include <linux/interrupt.h>
 #include <linux/timer.h>
 #include <linux/cdrom.h>
-#include <linux/devfs_fs_kernel.h>
 #include <linux/ioport.h>
 #include <linux/mm.h>
 #include <linux/slab.h>
diff --git a/drivers/cdrom/gscd.c b/drivers/cdrom/gscd.c
index ad5464ab99bc..b6ee50a2916d 100644
--- a/drivers/cdrom/gscd.c
+++ b/drivers/cdrom/gscd.c
@@ -955,7 +955,6 @@ static int __init gscd_init(void)
         gscd_disk->first_minor = 0;
         gscd_disk->fops = &gscd_fops;
         sprintf(gscd_disk->disk_name, "gscd");
-        sprintf(gscd_disk->devfs_name, "gscd");
 
         if (register_blkdev(MAJOR_NR, "gscd")) {
                 ret = -EIO;
diff --git a/drivers/cdrom/mcdx.c b/drivers/cdrom/mcdx.c
index 0f6e7aab8d2c..788c7a0b2fe3 100644
--- a/drivers/cdrom/mcdx.c
+++ b/drivers/cdrom/mcdx.c
@@ -74,7 +74,6 @@ static const char *mcdx_c_version
 #include <linux/major.h>
 #define MAJOR_NR MITSUMI_X_CDROM_MAJOR
 #include <linux/blkdev.h>
-#include <linux/devfs_fs_kernel.h>
 
 #include "mcdx.h"
 
diff --git a/drivers/cdrom/optcd.c b/drivers/cdrom/optcd.c
index 0b0eab4f40fa..25032d7edc55 100644
--- a/drivers/cdrom/optcd.c
+++ b/drivers/cdrom/optcd.c
@@ -2033,7 +2033,6 @@ static int __init optcd_init(void)
         optcd_disk->first_minor = 0;
         optcd_disk->fops = &opt_fops;
         sprintf(optcd_disk->disk_name, "optcd");
-        sprintf(optcd_disk->devfs_name, "optcd");
 
         if (!request_region(optcd_port, 4, "optcd")) {
                 printk(KERN_ERR "optcd: conflict, I/O port 0x%x already used\n",
diff --git a/drivers/cdrom/sbpcd.c b/drivers/cdrom/sbpcd.c
index 05c9e865ecaf..2fc966c65a0e 100644
--- a/drivers/cdrom/sbpcd.c
+++ b/drivers/cdrom/sbpcd.c
@@ -371,7 +371,6 @@
 #include <linux/kernel.h>
 #include <linux/cdrom.h>
 #include <linux/ioport.h>
-#include <linux/devfs_fs_kernel.h>
 #include <linux/major.h>
 #include <linux/string.h>
 #include <linux/vmalloc.h>
@@ -5808,8 +5807,6 @@ int __init sbpcd_init(void)
                 return -ENOMEM;
         }
 
-        devfs_mk_dir("sbp");
-
         for (j=0;j<NR_SBPCD;j++)
         {
                 struct cdrom_device_info * sbpcd_infop;
@@ -5871,7 +5868,6 @@ int __init sbpcd_init(void)
                 disk->fops = &sbpcd_bdops;
                 strcpy(disk->disk_name, sbpcd_infop->name);
                 disk->flags = GENHD_FL_CD;
-                sprintf(disk->devfs_name, "sbp/c0t%d", p->drv_id);
                 p->disk = disk;
                 if (register_cdrom(sbpcd_infop))
                 {
@@ -5906,7 +5902,6 @@ static void sbpcd_exit(void)
                 if (D_S[j].drv_id==-1) continue;
                 del_gendisk(D_S[j].disk);
                 put_disk(D_S[j].disk);
-                devfs_remove("sbp/c0t%d", j);
                 vfree(D_S[j].sbp_buf);
                 if (D_S[j].sbp_audsiz>0)
                         vfree(D_S[j].aud_buf);
@@ -5917,7 +5912,6 @@ static void sbpcd_exit(void)
                 }
                 vfree(D_S[j].sbpcd_infop);
         }
-        devfs_remove("sbp");
         msg(DBG_INF, "%s module released.\n", major_name);
 }
 
diff --git a/drivers/cdrom/sjcd.c b/drivers/cdrom/sjcd.c
index 74b1cadbf161..bf5aef4e555b 100644
--- a/drivers/cdrom/sjcd.c
+++ b/drivers/cdrom/sjcd.c
@@ -1695,7 +1695,6 @@ static int __init sjcd_init(void)
         sjcd_disk->first_minor = 0,
         sjcd_disk->fops = &sjcd_fops,
         sprintf(sjcd_disk->disk_name, "sjcd");
-        sprintf(sjcd_disk->devfs_name, "sjcd");
 
         if (!request_region(sjcd_base, 4,"sjcd")) {
                 printk
diff --git a/drivers/cdrom/sonycd535.c b/drivers/cdrom/sonycd535.c
index e65659926432..8f7cc452af8d 100644
--- a/drivers/cdrom/sonycd535.c
+++ b/drivers/cdrom/sonycd535.c
@@ -1589,7 +1589,6 @@ static int __init sony535_init(void)
         cdu_disk->first_minor = 0;
         cdu_disk->fops = &cdu_fops;
         sprintf(cdu_disk->disk_name, "cdu");
-        sprintf(cdu_disk->devfs_name, "cdu535");
 
         if (!request_region(sony535_cd_base_io, 4, CDU535_HANDLE)) {
                 printk(KERN_WARNING"sonycd535: Unable to request region 0x%x\n",
diff --git a/drivers/cdrom/viocd.c b/drivers/cdrom/viocd.c
index af6b3bfd169b..54ca931e19ea 100644
--- a/drivers/cdrom/viocd.c
+++ b/drivers/cdrom/viocd.c
@@ -49,7 +49,6 @@
 #include <asm/iseries/vio.h>
 
 #define VIOCD_DEVICE                    "iseries/vcd"
-#define VIOCD_DEVICE_DEVFS              "iseries/vcd"
 
 #define VIOCD_VERS "1.06"
 
@@ -688,8 +687,6 @@ static int viocd_probe(struct vio_dev *vdev, const struct vio_device_id *id)
         gendisk->first_minor = deviceno;
         strncpy(gendisk->disk_name, c->name,
                         sizeof(gendisk->disk_name));
-        snprintf(gendisk->devfs_name, sizeof(gendisk->devfs_name),
-                        VIOCD_DEVICE_DEVFS "%d", deviceno);
         blk_queue_max_hw_segments(q, 1);
         blk_queue_max_phys_segments(q, 1);
         blk_queue_max_sectors(q, 4096 / 512);