From: Keith Busch <keith.busch@intel.com>
Date: Tue, 7 Nov 2017 15:13:13 -0700
Subject: nvme: unexport starting async event work
Patch-mainline: v4.15-rc1
Git-commit: d99ca609a1b55f87a5e62a11ed70e4d091d815f0
References: FATE#323952, FATE#322506
Async event work is for core use only and should not be called directly
from drivers.
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Keith Busch <keith.busch@intel.com>
Reviewed-by: Guan Junxiong <guanjunxiong@huawei.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Acked-by: Johannes Thumshirn <jthumshirn@suse.de>
---
drivers/nvme/host/core.c | 8 +-------
drivers/nvme/host/nvme.h | 1 -
2 files changed, 1 insertion(+), 8 deletions(-)
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -2758,12 +2758,6 @@ void nvme_complete_async_event(struct nv
}
EXPORT_SYMBOL_GPL(nvme_complete_async_event);
-void nvme_queue_async_events(struct nvme_ctrl *ctrl)
-{
- queue_work(nvme_wq, &ctrl->async_event_work);
-}
-EXPORT_SYMBOL_GPL(nvme_queue_async_events);
-
void nvme_stop_ctrl(struct nvme_ctrl *ctrl)
{
nvme_stop_keep_alive(ctrl);
@@ -2780,7 +2774,7 @@ void nvme_start_ctrl(struct nvme_ctrl *c
if (ctrl->queue_count > 1) {
nvme_queue_scan(ctrl);
- nvme_queue_async_events(ctrl);
+ queue_work(nvme_wq, &ctrl->async_event_work);
nvme_start_queues(ctrl);
}
}
--- a/drivers/nvme/host/nvme.h
+++ b/drivers/nvme/host/nvme.h
@@ -314,7 +314,6 @@ int nvme_sec_submit(void *data, u16 spsp
void nvme_complete_async_event(struct nvme_ctrl *ctrl, __le16 status,
union nvme_result *res);
-void nvme_queue_async_events(struct nvme_ctrl *ctrl);
void nvme_stop_queues(struct nvme_ctrl *ctrl);
void nvme_start_queues(struct nvme_ctrl *ctrl);