aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2005-06-21 00:15:16 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2006-06-26 15:25:08 -0400
commitce7b0f46bbf4bff8daab2dd3d878b9e72a623d09 (patch)
tree7a860cf52fbf1ff768197702af60a8329d296dff /arch
parent96192ff1a9d0c6ef365d21667080259d83ea2f5b (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 'arch')
-rw-r--r--arch/um/drivers/ubd_kern.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/arch/um/drivers/ubd_kern.c b/arch/um/drivers/ubd_kern.c
index 5856a02fff58..c3e205b6a4c9 100644
--- a/arch/um/drivers/ubd_kern.c
+++ b/arch/um/drivers/ubd_kern.c
@@ -637,14 +637,10 @@ static int ubd_new_disk(int major, u64 size, int unit,
637 disk->first_minor = unit << UBD_SHIFT; 637 disk->first_minor = unit << UBD_SHIFT;
638 disk->fops = &ubd_blops; 638 disk->fops = &ubd_blops;
639 set_capacity(disk, size / 512); 639 set_capacity(disk, size / 512);
640 if(major == MAJOR_NR){ 640 if(major == MAJOR_NR)
641 sprintf(disk->disk_name, "ubd%c", 'a' + unit); 641 sprintf(disk->disk_name, "ubd%c", 'a' + unit);
642 sprintf(disk->devfs_name, "ubd/disc%d", unit); 642 else
643 }
644 else {
645 sprintf(disk->disk_name, "ubd_fake%d", unit); 643 sprintf(disk->disk_name, "ubd_fake%d", unit);
646 sprintf(disk->devfs_name, "ubd_fake/disc%d", unit);
647 }
648 644
649 /* sysfs register (not for ide fake devices) */ 645 /* sysfs register (not for ide fake devices) */
650 if (major == MAJOR_NR) { 646 if (major == MAJOR_NR) {