summaryrefslogtreecommitdiff
path: root/drivers/block/cpqarray.c
diff options
context:
space:
mode:
authorAlexander Viro <viro@math.psu.edu>2002-09-21 02:43:02 -0700
committerLinus Torvalds <torvalds@home.transmeta.com>2002-09-21 02:43:02 -0700
commitbc2ce86fdce2b62a9de49c4f893de76215ee312d (patch)
tree43a9824ffda07e9722fd06c59c7d7f89214e5e25 /drivers/block/cpqarray.c
parent50580f89400c41a9d4b24c4e80a396a5119770ea (diff)
[PATCH] switch to add_disk()
Almost all callers of add_gendisk() were immediately followed by register_disk(disk, mk_kdev(disk->major,disk->first_minor), 1<<disk->minor_shift, disk->fops, something); The only exception (DAC960.c) massaged to that form. New helper (add_disk(disk)) introduced and aforementioned sequence replaced with set_capacity(disk, something); add_disk(disk);
Diffstat (limited to 'drivers/block/cpqarray.c')
-rw-r--r--drivers/block/cpqarray.c14
1 files changed, 4 insertions, 10 deletions
diff --git a/drivers/block/cpqarray.c b/drivers/block/cpqarray.c
index d1947a4e2be6..dec7ab4b6cf9 100644
--- a/drivers/block/cpqarray.c
+++ b/drivers/block/cpqarray.c
@@ -449,11 +449,8 @@ int __init cpqarray_init(void)
continue;
disk->major_name = ida_names + (i*NWD+j)*10;
(BLK_DEFAULT_QUEUE(MAJOR_NR + i))->hardsect_size = drv->blk_size;
- add_gendisk(disk);
- register_disk(disk,
- mk_kdev(disk->major,disk->first_minor),
- 1<<disk->minor_shift, disk->fops,
- drv->nr_blks);
+ set_capacity(disk, drv->nr_blks);
+ add_disk(disk);
}
}
/* done ! */
@@ -1475,11 +1472,8 @@ static int revalidate_allvol(kdev_t dev)
continue;
(BLK_DEFAULT_QUEUE(MAJOR_NR + ctlr))->hardsect_size = drv->blk_size;
disk->major_name = ida_names + (ctlr*NWD+i)*10;
- add_gendisk(disk);
- register_disk(disk,
- mk_kdev(disk->major,disk->first_minor),
- 1<<disk->minor_shift, disk->fops,
- drv->nr_blks);
+ set_capacity(disk, drv->nr_blks);
+ add_disk(disk);
}
hba[ctlr]->usage_count--;