From bc2ce86fdce2b62a9de49c4f893de76215ee312d Mon Sep 17 00:00:00 2001
From: Alexander Viro <viro@math.psu.edu>
Date: Sat, 21 Sep 2002 02:43:02 -0700
Subject: [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);
---
 drivers/cdrom/cdu31a.c | 7 +------
 drivers/cdrom/cm206.c  | 7 +------
 drivers/cdrom/mcd.c    | 7 +------
 drivers/cdrom/mcdx.c   | 7 +------
 drivers/cdrom/sbpcd.c  | 7 +------
 5 files changed, 5 insertions(+), 30 deletions(-)

(limited to 'drivers/cdrom')

diff --git a/drivers/cdrom/cdu31a.c b/drivers/cdrom/cdu31a.c
index b197597a6d55..bd55ea0d8cd3 100644
--- a/drivers/cdrom/cdu31a.c
+++ b/drivers/cdrom/cdu31a.c
@@ -3443,12 +3443,7 @@ int __init cdu31a_init(void)
 		scd_info.mask = deficiency;
 		if (register_cdrom(&scd_info))
 			goto errout0;
-		add_gendisk(disk);
-		register_disk(disk,
-			      mk_kdev(disk->major,disk->first_minor),
-			      1<<disk->minor_shift,
-			      disk->fops,
-			      0);
+		add_disk(disk);
 	}
 
 
diff --git a/drivers/cdrom/cm206.c b/drivers/cdrom/cm206.c
index c43ed6d66fe1..a2c924b970be 100644
--- a/drivers/cdrom/cm206.c
+++ b/drivers/cdrom/cm206.c
@@ -1482,12 +1482,7 @@ int __init cm206_init(void)
 		printk(KERN_INFO "Cannot register for cdrom %d!\n", MAJOR_NR);
 		goto out_cdrom;
 	}
-	add_gendisk(disk);
-	register_disk(disk,
-		      mk_kdev(disk->major,disk->first_minor),
-		      1<<disk->minor_shift,
-		      disk->fops,
-		      0);
+	add_disk(disk);
 	blk_init_queue(BLK_DEFAULT_QUEUE(MAJOR_NR), do_cm206_request,
 		       &cm206_lock);
 	blk_queue_hardsect_size(BLK_DEFAULT_QUEUE(MAJOR_NR), 2048);
diff --git a/drivers/cdrom/mcd.c b/drivers/cdrom/mcd.c
index c417644e6df2..9fd5a13f05be 100644
--- a/drivers/cdrom/mcd.c
+++ b/drivers/cdrom/mcd.c
@@ -1130,12 +1130,7 @@ int __init mcd_init(void)
 		printk(KERN_ERR "mcd: Unable to register Mitsumi CD-ROM.\n");
 		goto out_cdrom;
 	}
-	add_gendisk(disk);
-	register_disk(disk,
-		      mk_kdev(disk->major,disk->first_minor),
-		      1<<disk->minor_shift,
-		      disk->fops,
-		      0);
+	add_disk(disk);
 	printk(msg);
 	return 0;
 
diff --git a/drivers/cdrom/mcdx.c b/drivers/cdrom/mcdx.c
index 22e7d30af945..748bae979b63 100644
--- a/drivers/cdrom/mcdx.c
+++ b/drivers/cdrom/mcdx.c
@@ -1230,12 +1230,7 @@ int __init mcdx_init_drive(int drive)
 		blk_cleanup_queue(BLK_DEFAULT_QUEUE(MAJOR_NR));
 		return 2;
 	}
-	add_gendisk(disk);
-	register_disk(disk,
-		      mk_kdev(disk->major,disk->first_minor),
-		      1<<disk->minor_shift,
-		      disk->fops,
-		      0);
+	add_disk(disk);
 	printk(msg);
 	return 0;
 }
diff --git a/drivers/cdrom/sbpcd.c b/drivers/cdrom/sbpcd.c
index b39b4b630d99..f255d069a752 100644
--- a/drivers/cdrom/sbpcd.c
+++ b/drivers/cdrom/sbpcd.c
@@ -5843,12 +5843,7 @@ int __init sbpcd_init(void)
 		{
 			printk(" sbpcd: Unable to register with Uniform CD-ROm driver\n");
 		}
-		add_gendisk(disk);
-		register_disk(disk,
-			      mk_kdev(disk->major,disk->first_minor),
-			      1<<disk->minor_shift,
-			      disk->fops,
-			      0);
+		add_disk(disk);
 	}
 	blk_queue_hardsect_size(BLK_DEFAULT_QUEUE(MAJOR_NR), CD_FRAMESIZE);
 
-- 
cgit v1.2.3