diff options
| author | Alexander Viro <viro@math.psu.edu> | 2002-09-21 02:43:02 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-09-21 02:43:02 -0700 |
| commit | bc2ce86fdce2b62a9de49c4f893de76215ee312d (patch) | |
| tree | 43a9824ffda07e9722fd06c59c7d7f89214e5e25 /drivers/message | |
| parent | 50580f89400c41a9d4b24c4e80a396a5119770ea (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/message')
| -rw-r--r-- | drivers/message/i2o/i2o_block.c | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/drivers/message/i2o/i2o_block.c b/drivers/message/i2o/i2o_block.c index ae7befdf574b..23f265d31c51 100644 --- a/drivers/message/i2o/i2o_block.c +++ b/drivers/message/i2o/i2o_block.c @@ -719,11 +719,7 @@ static int i2ob_evt(void *dummy) struct gendisk *p = &i2o_disk[unit>>4]; i2ob_install_device(i2ob_dev[unit].i2odev->controller, i2ob_dev[unit].i2odev, unit); - add_gendisk(p); - register_disk(p, - mk_kdev(p->major, p->first_minor), - 1<<p->minor_shift, p->fops, - get_capacity(p)); + add_disk(p); break; } @@ -1465,12 +1461,7 @@ static void i2ob_scan(int bios) printk(KERN_WARNING "Could not install I2O block device\n"); else { - struct gendisk *p = &i2o_disk[scan_unit>>4]; - add_gendisk(p); - register_disk(p, - mk_kdev(p->major, p->first_minor), - 1<<p->minor_shift, p->fops, - get_capacity(p)); + add_disk(&i2o_disk[scan_unit>>4]); scan_unit+=16; i2ob_dev_count++; @@ -1558,12 +1549,7 @@ void i2ob_new_device(struct i2o_controller *c, struct i2o_device *d) printk(KERN_ERR "i2o_block: Could not install new device\n"); else { - struct gendisk *p = &i2o_disk[unit>>4]; - add_gendisk(p); - register_disk(p, - mk_kdev(p->major, p->first_minor), - 1<<p->minor_shift, p->fops, - get_capacity(p)); + add_disk(&i2o_disk[unit>>4]); i2ob_dev_count++; i2o_device_notify_on(d, &i2o_block_handler); } |