[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>

15 files changed, 1 insertions, 21 deletions

diff --git a/drivers/block/DAC960.c b/drivers/block/DAC960.c
index dd8a1501142f..50ca1aa4ee3b 100644
--- a/drivers/block/DAC960.c
+++ b/drivers/block/DAC960.c
@@ -2530,7 +2530,6 @@ static boolean DAC960_RegisterBlockDevice(DAC960_Controller_T *Controller)
         blk_queue_max_sectors(RequestQueue, Controller->MaxBlocksPerCommand);
         disk->queue = RequestQueue;
         sprintf(disk->disk_name, "rd/c%dd%d", Controller->ControllerNumber, n);
-        sprintf(disk->devfs_name, "rd/host%d/target%d", Controller->ControllerNumber, n);
         disk->major = MajorNumber;
         disk->first_minor = n << DAC960_MaxPartitionsBits;
         disk->fops = &DAC960_BlockDeviceOperations;
diff --git a/drivers/block/acsi.c b/drivers/block/acsi.c
index 196c0ec9cd54..a317e4303952 100644
--- a/drivers/block/acsi.c
+++ b/drivers/block/acsi.c
@@ -1732,13 +1732,10 @@ int acsi_init( void )
                 struct gendisk *disk = acsi_gendisk[i];
                 sprintf(disk->disk_name, "ad%c", 'a'+i);
                 aip = &acsi_info[NDevices];
-                sprintf(disk->devfs_name, "ad/target%d/lun%d", aip->target, aip->lun);
                 disk->major = ACSI_MAJOR;
                 disk->first_minor = i << 4;
-                if (acsi_info[i].type != HARDDISK) {
+                if (acsi_info[i].type != HARDDISK)
                         disk->minors = 1;
-                        strcat(disk->devfs_name, "/disc");
-                }
                 disk->fops = &acsi_fops;
                 disk->private_data = &acsi_info[i];
                 set_capacity(disk, acsi_info[i].size);
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index 39b0f53186e8..05fb08312c01 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -3248,7 +3248,6 @@ static int __devinit cciss_init_one(struct pci_dev *pdev,
 
                 q->queuedata = hba[i];
                 sprintf(disk->disk_name, "cciss/c%dd%d", i, j);
-                sprintf(disk->devfs_name, "cciss/host%d/target%d", i, j);
                 disk->major = hba[i]->major;
                 disk->first_minor = j << NWD_SHIFT;
                 disk->fops = &cciss_fops;
diff --git a/drivers/block/cpqarray.c b/drivers/block/cpqarray.c
index f96e6c03593e..bfd245df0a8c 100644
--- a/drivers/block/cpqarray.c
+++ b/drivers/block/cpqarray.c
@@ -1805,8 +1805,6 @@ static void getgeometry(int ctlr)
 
                                 }
 
-                                sprintf(disk->devfs_name, "ida/c%dd%d", ctlr, log_unit);
-
                                 info_p->phys_drives =
                                     sense_config_buf->ctlr_phys_drv;
                                 info_p->drv_assign_map
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index dbf905ce0248..9983e7200210 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -1293,7 +1293,6 @@ static int __init loop_init(void)
                 disk->first_minor = i;
                 disk->fops = &lo_fops;
                 sprintf(disk->disk_name, "loop%d", i);
-                sprintf(disk->devfs_name, "loop/%d", i);
                 disk->private_data = lo;
                 disk->queue = lo->lo_queue;
         }
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index b164ee0ac79f..39662f0c9cce 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -657,7 +657,6 @@ static int __init nbd_init(void)
                 disk->private_data = &nbd_dev[i];
                 disk->flags |= GENHD_FL_SUPPRESS_PARTITION_INFO;
                 sprintf(disk->disk_name, "nbd%d", i);
-                sprintf(disk->devfs_name, "nbd/%d", i);
                 set_capacity(disk, 0x7ffffc00ULL << 1); /* 2 TB */
                 add_disk(disk);
         }
diff --git a/drivers/block/ps2esdi.c b/drivers/block/ps2esdi.c
index bea75f2cb211..a729013a3973 100644
--- a/drivers/block/ps2esdi.c
+++ b/drivers/block/ps2esdi.c
@@ -421,7 +421,6 @@ static int __init ps2esdi_geninit(void)
                 disk->major = PS2ESDI_MAJOR;
                 disk->first_minor = i<<6;
                 sprintf(disk->disk_name, "ed%c", 'a'+i);
-                sprintf(disk->devfs_name, "ed/target%d", i);
                 disk->fops = &ps2esdi_fops;
                 ps2esdi_gendisk[i] = disk;
         }
diff --git a/drivers/block/rd.c b/drivers/block/rd.c
index 536be2de989e..e64f26ec6140 100644
--- a/drivers/block/rd.c
+++ b/drivers/block/rd.c
@@ -457,7 +457,6 @@ static int __init rd_init(void)
                 disk->queue = rd_queue[i];
                 disk->flags |= GENHD_FL_SUPPRESS_PARTITION_INFO;
                 sprintf(disk->disk_name, "ram%d", i);
-                sprintf(disk->devfs_name, "rd/%d", i);
                 set_capacity(disk, rd_size * 2);
                 add_disk(rd_disks[i]);
         }
diff --git a/drivers/block/swim3.c b/drivers/block/swim3.c
index ef557b1043d8..628877945f9b 100644
--- a/drivers/block/swim3.c
+++ b/drivers/block/swim3.c
@@ -1061,7 +1061,6 @@ int swim3_init(void)
                 disk->queue = swim3_queue;
                 disk->flags |= GENHD_FL_REMOVABLE;
                 sprintf(disk->disk_name, "fd%d", i);
-                sprintf(disk->devfs_name, "floppy/%d", i);
                 set_capacity(disk, 2880);
                 add_disk(disk);
         }
diff --git a/drivers/block/sx8.c b/drivers/block/sx8.c
index 3a4814551568..fbddeb4b04a2 100644
--- a/drivers/block/sx8.c
+++ b/drivers/block/sx8.c
@@ -1509,7 +1509,6 @@ static int carm_init_disks(struct carm_host *host)
                 port->disk = disk;
                 sprintf(disk->disk_name, DRV_NAME "/%u",
                         (unsigned int) (host->id * CARM_MAX_PORTS) + i);
-                sprintf(disk->devfs_name, DRV_NAME "/%u_%u", host->id, i);
                 disk->major = host->major;
                 disk->first_minor = i * CARM_MINORS_PER_MAJOR;
                 disk->fops = &carm_bd_ops;
diff --git a/drivers/block/ub.c b/drivers/block/ub.c
index 87ec6458bd1d..d62b49fbf10c 100644
--- a/drivers/block/ub.c
+++ b/drivers/block/ub.c
@@ -28,7 +28,6 @@
 #include <scsi/scsi.h>
 
 #define DRV_NAME "ub"
-#define DEVFS_NAME DRV_NAME
 
 #define UB_MAJOR 180
 
@@ -2290,7 +2289,6 @@ static int ub_probe_lun(struct ub_dev *sc, int lnum)
                 goto err_diskalloc;
 
         sprintf(disk->disk_name, DRV_NAME "%c", lun->id + 'a');
-        sprintf(disk->devfs_name, DEVFS_NAME "/%c", lun->id + 'a');
         disk->major = UB_MAJOR;
         disk->first_minor = lun->id * UB_PARTS_PER_LUN;
         disk->fops = &ub_bd_fops;
diff --git a/drivers/block/umem.c b/drivers/block/umem.c
index f7d4c65a7b8c..585197b95af7 100644
--- a/drivers/block/umem.c
+++ b/drivers/block/umem.c
@@ -1192,7 +1192,6 @@ static int __init mm_init(void)
         for (i = 0; i < num_cards; i++) {
                 struct gendisk *disk = mm_gendisk[i];
                 sprintf(disk->disk_name, "umem%c", 'a'+i);
-                sprintf(disk->devfs_name, "umem/card%d", i);
                 spin_lock_init(&cards[i].lock);
                 disk->major = major_nr;
                 disk->first_minor  = i << MM_SHIFT;
diff --git a/drivers/block/viodasd.c b/drivers/block/viodasd.c
index b0df4f5ab97a..5cc7e671b033 100644
--- a/drivers/block/viodasd.c
+++ b/drivers/block/viodasd.c
@@ -523,8 +523,6 @@ retry:
         else
                 snprintf(g->disk_name, sizeof(g->disk_name),
                                 VIOD_GENHD_NAME "%c", 'a' + (dev_no % 26));
-        snprintf(g->devfs_name, sizeof(g->devfs_name),
-                        "%s%d", VIOD_GENHD_DEVFS_NAME, dev_no);
         g->fops = &viodasd_fops;
         g->queue = q;
         g->private_data = d;
diff --git a/drivers/block/xd.c b/drivers/block/xd.c
index cbce7c5e9445..e828e4cbd3e1 100644
--- a/drivers/block/xd.c
+++ b/drivers/block/xd.c
@@ -215,7 +215,6 @@ static int __init xd_init(void)
                 disk->major = XT_DISK_MAJOR;
                 disk->first_minor = i<<6;
                 sprintf(disk->disk_name, "xd%c", i+'a');
-                sprintf(disk->devfs_name, "xd/target%d", i);
                 disk->fops = &xd_fops;
                 disk->private_data = p;
                 disk->queue = xd_queue;
diff --git a/drivers/block/z2ram.c b/drivers/block/z2ram.c
index bb5e8d665a2a..82ddbdd7bd4b 100644
--- a/drivers/block/z2ram.c
+++ b/drivers/block/z2ram.c
@@ -354,7 +354,6 @@ z2_init(void)
     z2ram_gendisk->first_minor = 0;
     z2ram_gendisk->fops = &z2_fops;
     sprintf(z2ram_gendisk->disk_name, "z2ram");
-    strcpy(z2ram_gendisk->devfs_name, z2ram_gendisk->disk_name);
 
     z2ram_gendisk->queue = z2_queue;
     add_disk(z2ram_gendisk);