From a70c03cc78d0997f03d10157d99a45ac5331a992 Mon Sep 17 00:00:00 2001 From: Jim Harris Date: Fri, 10 Dec 2021 15:57:26 -0700 Subject: [PATCH] spdk_lspci: use spdk_pci_for_each_device Signed-off-by: Jim Harris Change-Id: I68bad0ad9868be7e06da217e028d4db8f37712e8 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/10656 Reviewed-by: Konrad Sztyber Reviewed-by: Ben Walker Reviewed-by: Aleksey Marchuk Tested-by: SPDK CI Jenkins Community-CI: Mellanox Build Bot --- app/spdk_lspci/spdk_lspci.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/app/spdk_lspci/spdk_lspci.c b/app/spdk_lspci/spdk_lspci.c index b976facb5..e414217c9 100644 --- a/app/spdk_lspci/spdk_lspci.c +++ b/app/spdk_lspci/spdk_lspci.c @@ -49,7 +49,7 @@ pci_enum_cb(void *ctx, struct spdk_pci_device *dev) } static void -print_pci_dev(struct spdk_pci_device *dev) +print_pci_dev(void *ctx, struct spdk_pci_device *dev) { struct spdk_pci_addr pci_addr = spdk_pci_device_get_addr(dev); char addr[32] = { 0 }; @@ -76,7 +76,6 @@ main(int argc, char **argv) { int op; struct spdk_env_opts opts; - struct spdk_pci_device *dev; while ((op = getopt(argc, argv, "h")) != -1) { switch (op) { @@ -106,16 +105,8 @@ main(int argc, char **argv) return 1; } - dev = spdk_pci_get_first_device(); - if (!dev) { - printf("\nLack of PCI devices available for SPDK!\n"); - } - printf("\nList of available PCI devices:\n"); - while (dev) { - print_pci_dev(dev); - dev = spdk_pci_get_next_device(dev); - } + spdk_pci_for_each_device(NULL, print_pci_dev); spdk_vmd_fini();