summaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2009-06-16 22:07:32 +0200
committerJens Axboe <jens.axboe@oracle.com>2009-06-18 09:56:20 +0200
commitddeb9c3e949751992628628d000915a317df52c4 (patch)
tree34f9a6fcf0e0abbe51644ca74932a35fc1fcfbd7 /drivers/block
parent1d89b30cc9be41af87881682ec82e2c107849dbe (diff)
downloadlinux-ddeb9c3e949751992628628d000915a317df52c4.tar.gz
linux-ddeb9c3e949751992628628d000915a317df52c4.tar.bz2
linux-ddeb9c3e949751992628628d000915a317df52c4.zip
hd: stop defining MAJOR_NR
Just use HD_MAJOR directly. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/hd.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/block/hd.c b/drivers/block/hd.c
index f65b3f369eb0..f9d01608cbe2 100644
--- a/drivers/block/hd.c
+++ b/drivers/block/hd.c
@@ -100,8 +100,6 @@ static DEFINE_SPINLOCK(hd_lock);
static struct request_queue *hd_queue;
static struct request *hd_req;
-#define MAJOR_NR HD_MAJOR
-
#define TIMEOUT_VALUE (6*HZ)
#define HD_DELAY 0
@@ -712,12 +710,12 @@ static int __init hd_init(void)
{
int drive;
- if (register_blkdev(MAJOR_NR, "hd"))
+ if (register_blkdev(HD_MAJOR, "hd"))
return -1;
hd_queue = blk_init_queue(do_hd_request, &hd_lock);
if (!hd_queue) {
- unregister_blkdev(MAJOR_NR, "hd");
+ unregister_blkdev(HD_MAJOR, "hd");
return -ENOMEM;
}
@@ -751,7 +749,7 @@ static int __init hd_init(void)
struct hd_i_struct *p = &hd_info[drive];
if (!disk)
goto Enomem;
- disk->major = MAJOR_NR;
+ disk->major = HD_MAJOR;
disk->first_minor = drive << 6;
disk->fops = &hd_fops;
sprintf(disk->disk_name, "hd%c", 'a'+drive);
@@ -795,7 +793,7 @@ out1:
NR_HD = 0;
out:
del_timer(&device_timer);
- unregister_blkdev(MAJOR_NR, "hd");
+ unregister_blkdev(HD_MAJOR, "hd");
blk_cleanup_queue(hd_queue);
return -1;
Enomem: