diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2005-06-20 21:15:16 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-06-26 12:25:08 -0700 |
| commit | ce7b0f46bbf4bff8daab2dd3d878b9e72a623d09 (patch) | |
| tree | 7a860cf52fbf1ff768197702af60a8329d296dff /arch/um | |
| parent | 96192ff1a9d0c6ef365d21667080259d83ea2f5b (diff) | |
| download | blackbird-op-linux-ce7b0f46bbf4bff8daab2dd3d878b9e72a623d09.tar.gz blackbird-op-linux-ce7b0f46bbf4bff8daab2dd3d878b9e72a623d09.zip | |
[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/um')
| -rw-r--r-- | arch/um/drivers/ubd_kern.c | 8 |
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, disk->first_minor = unit << UBD_SHIFT; disk->fops = &ubd_blops; set_capacity(disk, size / 512); - if(major == MAJOR_NR){ + if(major == MAJOR_NR) sprintf(disk->disk_name, "ubd%c", 'a' + unit); - sprintf(disk->devfs_name, "ubd/disc%d", unit); - } - else { + else sprintf(disk->disk_name, "ubd_fake%d", unit); - sprintf(disk->devfs_name, "ubd_fake/disc%d", unit); - } /* sysfs register (not for ide fake devices) */ if (major == MAJOR_NR) { |
