[PATCH] devfs: Remove the gendisk devfs_name field as it's no longer needed

And remove the now unneeded number field.
Also fixes all drivers that set these fields.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

7 files changed, 0 insertions, 8 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/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/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 a75b363b19c5..2fc966c65a0e 100644
--- a/drivers/cdrom/sbpcd.c
+++ b/drivers/cdrom/sbpcd.c
@@ -5868,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))
                 {
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..f65597081171 100644
--- a/drivers/cdrom/viocd.c
+++ b/drivers/cdrom/viocd.c
@@ -688,8 +688,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);