diff options
| author | NeilBrown <neilb@suse.com> | 2016-07-13 11:03:58 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2016-07-14 08:52:56 -0700 |
| commit | b09dcf585df959cf26270e65941ea1f79a1345aa (patch) | |
| tree | 98600092d09d49797ed3abb493fb93b4dbe0cf15 /drivers | |
| parent | 2fa843512bb5bbc0e876e4f55e22f26a3a8d3edb (diff) | |
| download | linux-b09dcf585df959cf26270e65941ea1f79a1345aa.tar.gz linux-b09dcf585df959cf26270e65941ea1f79a1345aa.tar.bz2 linux-b09dcf585df959cf26270e65941ea1f79a1345aa.zip | |
NVMe: don't allocate unused nvme_major
When alloc_disk(0) is used, the ->major number is ignored. All device
numbers are allocated with a major of BLOCK_EXT_MAJOR.
So remove all references to nvme_major.
[akpm@linux-foundation.org: one unregister_blkdev() was missed]
Link: http://lkml.kernel.org/r/20160602064318.4403.93301.stgit@noble
Signed-off-by: NeilBrown <neilb@suse.com>
Reviewed-by: Keith Busch <keith.busch@intel.com>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Maxim Levitsky <maximlevitsky@gmail.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/nvme/host/core.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index 86a0c661e74c..cf4b75088876 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -53,9 +53,6 @@ module_param_named(max_retries, nvme_max_retries, uint, 0644); MODULE_PARM_DESC(max_retries, "max number of retries a command may have"); EXPORT_SYMBOL_GPL(nvme_max_retries); -static int nvme_major; -module_param(nvme_major, int, 0); - static int nvme_char_major; module_param(nvme_char_major, int, 0); @@ -1674,8 +1671,6 @@ static void nvme_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid) blk_queue_logical_block_size(ns->queue, 1 << ns->lba_shift); nvme_set_queue_limits(ctrl, ns->queue); - disk->major = nvme_major; - disk->first_minor = 0; disk->fops = &nvme_fops; disk->private_data = ns; disk->queue = ns->queue; @@ -2085,16 +2080,10 @@ int __init nvme_core_init(void) { int result; - result = register_blkdev(nvme_major, "nvme"); - if (result < 0) - return result; - else if (result > 0) - nvme_major = result; - result = __register_chrdev(nvme_char_major, 0, NVME_MINORS, "nvme", &nvme_dev_fops); if (result < 0) - goto unregister_blkdev; + return result; else if (result > 0) nvme_char_major = result; @@ -2108,8 +2097,6 @@ int __init nvme_core_init(void) unregister_chrdev: __unregister_chrdev(nvme_char_major, 0, NVME_MINORS, "nvme"); - unregister_blkdev: - unregister_blkdev(nvme_major, "nvme"); return result; } @@ -2117,7 +2104,6 @@ void nvme_core_exit(void) { class_destroy(nvme_class); __unregister_chrdev(nvme_char_major, 0, NVME_MINORS, "nvme"); - unregister_blkdev(nvme_major, "nvme"); } MODULE_LICENSE("GPL"); |