From ea6c27099c8fb81dceabd938b44f0096ec1bfbf9 Mon Sep 17 00:00:00 2001 From: Dariusz Stojaczyk Date: Fri, 9 Feb 2018 20:08:07 +0100 Subject: [PATCH] vhost: removed spdk_vhost_dev_find_id This internal function was now being used in one place only. Inlined it so there's less code. Change-Id: Ide52494d0e0f9563ce35ef7bf9166f62734a8309 Signed-off-by: Dariusz Stojaczyk Reviewed-on: https://review.gerrithub.io/399440 Reviewed-by: Daniel Verkamp Tested-by: SPDK Automated Test System Reviewed-by: Jim Harris --- lib/vhost/vhost.c | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/lib/vhost/vhost.c b/lib/vhost/vhost.c index 44ee45adc..803ceac0b 100644 --- a/lib/vhost/vhost.c +++ b/lib/vhost/vhost.c @@ -559,8 +559,8 @@ spdk_vhost_free_reactor(uint32_t lcore) g_num_ctrlrs[lcore]--; } -static int -spdk_vhost_dev_find_id(const char *ctrlr_name) +struct spdk_vhost_dev * +spdk_vhost_dev_find(const char *ctrlr_name) { unsigned i; size_t dev_dirname_len = strlen(dev_dirname); @@ -575,24 +575,11 @@ spdk_vhost_dev_find_id(const char *ctrlr_name) } if (strcmp(g_spdk_vhost_devices[i]->name, ctrlr_name) == 0) { - return i; + return g_spdk_vhost_devices[i]; } } - return -1; -} - -struct spdk_vhost_dev * -spdk_vhost_dev_find(const char *ctrlr_name) -{ - int id; - - id = spdk_vhost_dev_find_id(ctrlr_name); - if (id == -1) { - return NULL; - } - - return g_spdk_vhost_devices[id]; + return NULL; } static int