From 0920923ce2a6f13b42c0cef21fbab03b948ccd75 Mon Sep 17 00:00:00 2001 From: Daniel Verkamp Date: Wed, 28 Mar 2018 15:39:22 -0700 Subject: [PATCH] nvme/perf: remove PCI ID print in probe_cb The vendor:device ID is already printed out in attach_cb, so printing it again in probe_cb isn't that useful. This also lets us remove the last use of spdk_pci_get_device(), allowing it to be deprecated and removed in future patches. Change-Id: Ie65abf136cce4d413f06594f91533ab9f9d4aca7 Signed-off-by: Daniel Verkamp Reviewed-on: https://review.gerrithub.io/405708 Tested-by: SPDK Automated Test System Reviewed-by: Changpeng Liu Reviewed-by: Jim Harris --- examples/nvme/perf/perf.c | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/examples/nvme/perf/perf.c b/examples/nvme/perf/perf.c index 250296aae3..fded86e018 100644 --- a/examples/nvme/perf/perf.c +++ b/examples/nvme/perf/perf.c @@ -1427,33 +1427,17 @@ static bool probe_cb(void *cb_ctx, const struct spdk_nvme_transport_id *trid, struct spdk_nvme_ctrlr_opts *opts) { - struct spdk_pci_addr pci_addr; - struct spdk_pci_device *pci_dev; - struct spdk_pci_id pci_id; - if (trid->trtype != SPDK_NVME_TRANSPORT_PCIE) { printf("Attaching to NVMe over Fabrics controller at %s:%s: %s\n", trid->traddr, trid->trsvcid, trid->subnqn); } else { - if (spdk_pci_addr_parse(&pci_addr, trid->traddr)) { - return false; - } - - pci_dev = spdk_pci_get_device(&pci_addr); - if (!pci_dev) { - return false; - } - if (g_disable_sq_cmb) { opts->use_cmb_sqs = false; } - pci_id = spdk_pci_device_get_id(pci_dev); - - printf("Attaching to NVMe Controller at %s [%04x:%04x]\n", - trid->traddr, - pci_id.vendor_id, pci_id.device_id); + printf("Attaching to NVMe Controller at %s\n", + trid->traddr); } /* Set io_queue_size to UINT16_MAX, NVMe driver