diff options
| author |   Christoph Hellwig <hch@lst.de> | 2015-05-22 11:12:38 +0200 |
|---|---|---|
| committer |   Jens Axboe <axboe@fb.com> | 2015-05-22 08:36:31 -0600 |
| commit | f705f837c58ebe1ea69dfffff4dcc234e2fbc8dd (patch) | |
| tree | 3ee19fdafd50d3fedff621e17ea7d1117c8e4c13 /include/linux/nvme.h | |
| parent | loop: remove (now) unused 'out' label (diff) | |
| download | linux-dev-f705f837c58ebe1ea69dfffff4dcc234e2fbc8dd.tar.xz linux-dev-f705f837c58ebe1ea69dfffff4dcc234e2fbc8dd.zip | |
nvme: consolidate synchronous command submission helpers
Note that we keep the unused timeout argument, but allow callers to
pass 0 instead of a timeout if they want the default. This will allow
adding a timeout to the pass through path later on.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'include/linux/nvme.h')
| -rw-r--r-- | include/linux/nvme.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/include/linux/nvme.h b/include/linux/nvme.h index 8dbd05e70f09..61488b2ae291 100644 --- a/include/linux/nvme.h +++ b/include/linux/nvme.h @@ -158,11 +158,7 @@ struct nvme_iod *nvme_map_user_pages(struct nvme_dev *dev, int write, unsigned long addr, unsigned length); void nvme_unmap_user_pages(struct nvme_dev *dev, int write, struct nvme_iod *iod); -int nvme_submit_io_cmd(struct nvme_dev *, struct nvme_ns *, - struct nvme_command *, u32 *); -int nvme_submit_flush_data(struct nvme_queue *nvmeq, struct nvme_ns *ns); -int nvme_submit_admin_cmd(struct nvme_dev *, struct nvme_command *, - u32 *result); +int nvme_submit_sync_cmd(struct request_queue *q, struct nvme_command *cmd); int nvme_identify(struct nvme_dev *, unsigned nsid, unsigned cns, dma_addr_t dma_addr); int nvme_get_features(struct nvme_dev *dev, unsigned fid, unsigned nsid, |