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>

diff --git a/drivers/block/hd.c b/drivers/block/hd.c
index f65b3f369eb0ce795936045484cfdf9bb7367ac3..f9d01608cbe2740d2bbc6e98045f6f1f1b34db22 100644 (file)
--- 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: