diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2005-06-21 00:15:16 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-06-26 15:25:08 -0400 |
commit | ce7b0f46bbf4bff8daab2dd3d878b9e72a623d09 (patch) | |
tree | 7a860cf52fbf1ff768197702af60a8329d296dff /drivers/s390/block | |
parent | 96192ff1a9d0c6ef365d21667080259d83ea2f5b (diff) |
[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>
Diffstat (limited to 'drivers/s390/block')
-rw-r--r-- | drivers/s390/block/dasd_genhd.c | 2 | ||||
-rw-r--r-- | drivers/s390/block/xpram.c | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/drivers/s390/block/dasd_genhd.c b/drivers/s390/block/dasd_genhd.c index fce2835e7d19..61ffde718a7a 100644 --- a/drivers/s390/block/dasd_genhd.c +++ b/drivers/s390/block/dasd_genhd.c | |||
@@ -68,8 +68,6 @@ dasd_gendisk_alloc(struct dasd_device *device) | |||
68 | } | 68 | } |
69 | len += sprintf(gdp->disk_name + len, "%c", 'a'+(device->devindex%26)); | 69 | len += sprintf(gdp->disk_name + len, "%c", 'a'+(device->devindex%26)); |
70 | 70 | ||
71 | sprintf(gdp->devfs_name, "dasd/%s", device->cdev->dev.bus_id); | ||
72 | |||
73 | if (device->features & DASD_FEATURE_READONLY) | 71 | if (device->features & DASD_FEATURE_READONLY) |
74 | set_disk_ro(gdp, 1); | 72 | set_disk_ro(gdp, 1); |
75 | gdp->private_data = device; | 73 | gdp->private_data = device; |
diff --git a/drivers/s390/block/xpram.c b/drivers/s390/block/xpram.c index f57a6c8816b8..4c1e56b9b98d 100644 --- a/drivers/s390/block/xpram.c +++ b/drivers/s390/block/xpram.c | |||
@@ -466,7 +466,6 @@ static int __init xpram_setup_blkdev(void) | |||
466 | disk->private_data = &xpram_devices[i]; | 466 | disk->private_data = &xpram_devices[i]; |
467 | disk->queue = xpram_queue; | 467 | disk->queue = xpram_queue; |
468 | sprintf(disk->disk_name, "slram%d", i); | 468 | sprintf(disk->disk_name, "slram%d", i); |
469 | sprintf(disk->devfs_name, "slram/%d", i); | ||
470 | set_capacity(disk, xpram_sizes[i] << 1); | 469 | set_capacity(disk, xpram_sizes[i] << 1); |
471 | add_disk(disk); | 470 | add_disk(disk); |
472 | } | 471 | } |