From 18ce4323371d5cccbad3f5c6e42af114c8daa867 Mon Sep 17 00:00:00 2001 From: Daniel Verkamp Date: Tue, 22 Sep 2015 10:12:00 -0700 Subject: [PATCH] nvme: simplify nvme_ctrlr_construct_admin_qpairs Remove unnecessary local variables. Change-Id: Iddcbe24f0a704b6576c9139734258a27a6d272c6 Signed-off-by: Daniel Verkamp --- lib/nvme/nvme_ctrlr.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/lib/nvme/nvme_ctrlr.c b/lib/nvme/nvme_ctrlr.c index 410550a43..7a1ce8240 100644 --- a/lib/nvme/nvme_ctrlr.c +++ b/lib/nvme/nvme_ctrlr.c @@ -44,17 +44,11 @@ static void nvme_ctrlr_construct_and_submit_aer(struct nvme_controller *ctrlr, static int nvme_ctrlr_construct_admin_qpair(struct nvme_controller *ctrlr) { - struct nvme_qpair *qpair; - int rc; - - qpair = &ctrlr->adminq; - - rc = nvme_qpair_construct(qpair, - 0, /* qpair ID */ - NVME_ADMIN_ENTRIES, - NVME_ADMIN_TRACKERS, - ctrlr); - return rc; + return nvme_qpair_construct(&ctrlr->adminq, + 0, /* qpair ID */ + NVME_ADMIN_ENTRIES, + NVME_ADMIN_TRACKERS, + ctrlr); } static int