luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hd: stop defining MAJOR_NR

Browse Source 
Just use HD_MAJOR directly.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
This commit is contained in:
Christoph Hellwig 2009-06-16 22:07:32 +02:00 committed by Jens Axboe
parent 1d89b30cc9
commit ddeb9c3e94
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/block/hd.c
View File

@ -100,8 +100,6 @@ static DEFINE_SPINLOCK(hd_lock);
static struct request_queue *hd_queue; static struct request_queue *hd_queue;
static struct request *hd_req; static struct request *hd_req;
#define MAJOR_NR HD_MAJOR
#define TIMEOUT_VALUE (6*HZ) #define TIMEOUT_VALUE (6*HZ)
#define HD_DELAY 0 #define HD_DELAY 0
@ -712,12 +710,12 @@ static int __init hd_init(void)
{ {
int drive; int drive;
if (register_blkdev(MAJOR_NR, "hd")) if (register_blkdev(HD_MAJOR, "hd"))
return -1; return -1;
hd_queue = blk_init_queue(do_hd_request, &hd_lock); hd_queue = blk_init_queue(do_hd_request, &hd_lock);
if (!hd_queue) { if (!hd_queue) {
unregister_blkdev(MAJOR_NR, "hd"); unregister_blkdev(HD_MAJOR, "hd");
return -ENOMEM; return -ENOMEM;
} }
@ -751,7 +749,7 @@ static int __init hd_init(void)
struct hd_i_struct *p = &hd_info[drive]; struct hd_i_struct *p = &hd_info[drive];
if (!disk) if (!disk)
goto Enomem; goto Enomem;
disk->major = MAJOR_NR; disk->major = HD_MAJOR;
disk->first_minor = drive << 6; disk->first_minor = drive << 6;
disk->fops = &hd_fops; disk->fops = &hd_fops;
sprintf(disk->disk_name, "hd%c", 'a'+drive); sprintf(disk->disk_name, "hd%c", 'a'+drive);
@ -795,7 +793,7 @@ static int __init hd_init(void)
NR_HD = 0; NR_HD = 0;
out: out:
del_timer(&device_timer); del_timer(&device_timer);
unregister_blkdev(MAJOR_NR, "hd"); unregister_blkdev(HD_MAJOR, "hd");
blk_cleanup_queue(hd_queue); blk_cleanup_queue(hd_queue);
return -1; return -1;
Enomem: Enomem: