summaryrefslogtreecommitdiffstats
path: root/drivers/nvme/host/pci.c
diff options
context:
space:
mode:
authorMing Lin2016-02-10 19:03:32 +0100
committerJens Axboe2016-02-10 22:22:38 +0100
commit576d55d625664a20ee4bae6500952febfb2d7b10 (patch)
tree33b6e4148579ff7581c3fc9fddeeb2eb0f0d9511 /drivers/nvme/host/pci.c
parentnvme: split dev_list_lock (diff)
downloadkernel-qcow2-linux-576d55d625664a20ee4bae6500952febfb2d7b10.tar.gz
kernel-qcow2-linux-576d55d625664a20ee4bae6500952febfb2d7b10.tar.xz
kernel-qcow2-linux-576d55d625664a20ee4bae6500952febfb2d7b10.zip
nvme: split pci module out of core module
NVMe over Fabrics drivers are going to reuse the core, so splits nvme.ko into 2 modules: nvme-core.ko: the core part nvme.ko: the PCI driver Export symbols from nvme-core.ko. Reviewed-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Ming Lin <ming.l@ssi.samsung.com> Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'drivers/nvme/host/pci.c')
-rw-r--r--drivers/nvme/host/pci.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index 54e79c035913..fec747917690 100644
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -2230,26 +2230,15 @@ static int __init nvme_init(void)
if (!nvme_workq)
return -ENOMEM;
- result = nvme_core_init();
- if (result < 0)
- goto kill_workq;
-
result = pci_register_driver(&nvme_driver);
if (result)
- goto core_exit;
- return 0;
-
- core_exit:
- nvme_core_exit();
- kill_workq:
- destroy_workqueue(nvme_workq);
+ destroy_workqueue(nvme_workq);
return result;
}
static void __exit nvme_exit(void)
{
pci_unregister_driver(&nvme_driver);
- nvme_core_exit();
destroy_workqueue(nvme_workq);
BUG_ON(nvme_thread && !IS_ERR(nvme_thread));
_nvme_check_size();