From 655d98f52eb498389ad43464121b7e3c9bf02bef Mon Sep 17 00:00:00 2001 From: Liang Yan Date: Wed, 23 Sep 2015 15:20:33 +0800 Subject: [PATCH] nvme: remove _nvme_io_qpair_destroy function Since it is empty function. It can be deleted. Add nvme_assert to fix issue reported by scan-build. Change-Id: Ia0e8f656e1dac0da7ec72f8404469ea1b0dcb40e Signed-off-by: Liang Yan --- lib/nvme/nvme_qpair.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/lib/nvme/nvme_qpair.c b/lib/nvme/nvme_qpair.c index b39711ad2..06c6cb7af 100644 --- a/lib/nvme/nvme_qpair.c +++ b/lib/nvme/nvme_qpair.c @@ -150,6 +150,9 @@ nvme_io_qpair_print_command(struct nvme_qpair *qpair, static void nvme_qpair_print_command(struct nvme_qpair *qpair, struct nvme_command *cmd) { + nvme_assert(qpair != NULL, ("qpair can not be NULL")); + nvme_assert(cmd != NULL, ("cmd can not be NULL")); + if (nvme_qpair_is_admin_queue(qpair)) { nvme_admin_qpair_print_command(qpair, cmd); } else { @@ -576,19 +579,13 @@ _nvme_admin_qpair_destroy(struct nvme_qpair *qpair) nvme_admin_qpair_abort_aers(qpair); } -static void -_nvme_io_qpair_destroy(struct nvme_qpair *qpair) -{ -} void nvme_qpair_destroy(struct nvme_qpair *qpair) { struct nvme_tracker *tr; - if (nvme_qpair_is_io_queue(qpair)) { - _nvme_io_qpair_destroy(qpair); - } else { + if (nvme_qpair_is_admin_queue(qpair)) { _nvme_admin_qpair_destroy(qpair); } if (qpair->cmd)