diff options
| author | Pierre Ossman <drzeus@drzeus.cx> | 2007-05-14 17:27:29 +0200 |
|---|---|---|
| committer | Pierre Ossman <drzeus@drzeus.cx> | 2007-05-14 18:51:43 +0200 |
| commit | fe6b4c8840c5e23fe9b8696450cee8f2e8cebffd (patch) | |
| tree | b5812c0950da7c1a32c3f098874aa26b2d4062e5 | |
| parent | 6ba736a10e4ae63b38ccfee9f22b3263a6e5d050 (diff) | |
| download | kernel_goldelico_gta04-fe6b4c8840c5e23fe9b8696450cee8f2e8cebffd.zip kernel_goldelico_gta04-fe6b4c8840c5e23fe9b8696450cee8f2e8cebffd.tar.gz kernel_goldelico_gta04-fe6b4c8840c5e23fe9b8696450cee8f2e8cebffd.tar.bz2 | |
mmc: use assigned major for block device
The MMC block devices now have an assigned major. Make sure
we actually use it.
Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
| -rw-r--r-- | drivers/mmc/card/block.c | 17 | ||||
| -rw-r--r-- | include/linux/major.h | 2 |
2 files changed, 6 insertions, 13 deletions
diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c index d24ab23..a7562f7 100644 --- a/drivers/mmc/card/block.c +++ b/drivers/mmc/card/block.c @@ -45,8 +45,6 @@ */ #define MMC_SHIFT 3 -static int major; - /* * There is one mmc_blk_data per slot. */ @@ -466,7 +464,7 @@ static struct mmc_blk_data *mmc_blk_alloc(struct mmc_card *card) md->queue.issue_fn = mmc_blk_issue_rq; md->queue.data = md; - md->disk->major = major; + md->disk->major = MMC_BLOCK_MAJOR; md->disk->first_minor = devidx << MMC_SHIFT; md->disk->fops = &mmc_bdops; md->disk->private_data = md; @@ -634,14 +632,9 @@ static int __init mmc_blk_init(void) { int res = -ENOMEM; - res = register_blkdev(major, "mmc"); - if (res < 0) { - printk(KERN_WARNING "Unable to get major %d for MMC media: %d\n", - major, res); + res = register_blkdev(MMC_BLOCK_MAJOR, "mmc"); + if (res) goto out; - } - if (major == 0) - major = res; return mmc_register_driver(&mmc_driver); @@ -652,7 +645,7 @@ static int __init mmc_blk_init(void) static void __exit mmc_blk_exit(void) { mmc_unregister_driver(&mmc_driver); - unregister_blkdev(major, "mmc"); + unregister_blkdev(MMC_BLOCK_MAJOR, "mmc"); } module_init(mmc_blk_init); @@ -661,5 +654,3 @@ module_exit(mmc_blk_exit); MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("Multimedia Card (MMC) block device driver"); -module_param(major, int, 0444); -MODULE_PARM_DESC(major, "specify the major device number for MMC block driver"); diff --git a/include/linux/major.h b/include/linux/major.h index 0a74c52..7e7c909 100644 --- a/include/linux/major.h +++ b/include/linux/major.h @@ -152,6 +152,8 @@ #define USB_ACM_AUX_MAJOR 167 #define USB_CHAR_MAJOR 180 +#define MMC_BLOCK_MAJOR 179 + #define VXVM_MAJOR 199 /* VERITAS volume i/o driver */ #define VXSPEC_MAJOR 200 /* VERITAS volume config driver */ #define VXDMP_MAJOR 201 /* VERITAS volume multipath driver */ |