diff options
| author | NeilBrown <neilb@suse.com> | 2016-03-09 09:21:54 +1100 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2016-03-09 11:31:34 -0800 |
| commit | 55155291b32d24371256adbcc67f9f53cf3f314f (patch) | |
| tree | c5ff7bdc93a893e56a2c80ed6d6ca1ac58da886a /drivers/nvdimm | |
| parent | af1996ef59dbcb36fe4878df7c717a02eb89d07a (diff) | |
| download | linux-55155291b32d24371256adbcc67f9f53cf3f314f.tar.bz2 | |
pmem: don't allocate unused major device number
When alloc_disk(0) or alloc_disk-node(0, XX) is used, the ->major
number is completely ignored: all devices are allocated with a
major of BLOCK_EXT_MAJOR.
So there is no point allocating pmem_major.
Signed-off-by: NeilBrown <neilb@suse.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers/nvdimm')
| -rw-r--r-- | drivers/nvdimm/pmem.c | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/drivers/nvdimm/pmem.c b/drivers/nvdimm/pmem.c index 74e2569910d8..ba8d5b6bfad0 100644 --- a/drivers/nvdimm/pmem.c +++ b/drivers/nvdimm/pmem.c @@ -50,8 +50,6 @@ struct pmem_device { struct badblocks bb; }; -static int pmem_major; - static bool is_bad_pmem(struct badblocks *bb, sector_t sector, unsigned int len) { if (bb->count) { @@ -231,8 +229,6 @@ static int pmem_attach_disk(struct device *dev, return -ENOMEM; } - disk->major = pmem_major; - disk->first_minor = 0; disk->fops = &pmem_fops; disk->private_data = pmem; disk->queue = pmem->pmem_queue; @@ -579,26 +575,13 @@ static struct nd_device_driver nd_pmem_driver = { static int __init pmem_init(void) { - int error; - - pmem_major = register_blkdev(0, "pmem"); - if (pmem_major < 0) - return pmem_major; - - error = nd_driver_register(&nd_pmem_driver); - if (error) { - unregister_blkdev(pmem_major, "pmem"); - return error; - } - - return 0; + return nd_driver_register(&nd_pmem_driver); } module_init(pmem_init); static void pmem_exit(void) { driver_unregister(&nd_pmem_driver.drv); - unregister_blkdev(pmem_major, "pmem"); } module_exit(pmem_exit); |