[PATCH v2 8/9] ocxl: Use pci core's DVSEC functionality

[Ben Widawsky]

Reduce maintenance burden of DVSEC query implementation by using the
centralized PCI core implementation.

There are two obvious places to simply drop in the new core
implementation. There remains find_dvsec_from_pos() which would benefit
from using a core implementation. As that change is less trivial it is
reserved for later.

Cc: linuxppc-dev@lists.ozlabs.org
Cc: Andrew Donnellan <a...@linux.ibm.com>
Acked-by: Frederic Barrat <fbar...@linux.ibm.com> (v1)
Signed-off-by: Ben Widawsky <ben.widaw...@intel.com>
---
 arch/powerpc/platforms/powernv/ocxl.c |  3 ++-
 drivers/misc/ocxl/config.c            | 13 +------------
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/arch/powerpc/platforms/powernv/ocxl.c 
b/arch/powerpc/platforms/powernv/ocxl.c
index 9105efcf242a..28b009b46464 100644
--- a/arch/powerpc/platforms/powernv/ocxl.c
+++ b/arch/powerpc/platforms/powernv/ocxl.c
@@ -107,7 +107,8 @@ static int get_max_afu_index(struct pci_dev *dev, int 
*afu_idx)
        int pos;
        u32 val;
 
-       pos = find_dvsec_from_pos(dev, OCXL_DVSEC_FUNC_ID, 0);
+       pos = pci_find_dvsec_capability(dev, PCI_VENDOR_ID_IBM,
+                                       OCXL_DVSEC_FUNC_ID);
        if (!pos)
                return -ESRCH;
 
diff --git a/drivers/misc/ocxl/config.c b/drivers/misc/ocxl/config.c
index a68738f38252..e401a51596b9 100644
--- a/drivers/misc/ocxl/config.c
+++ b/drivers/misc/ocxl/config.c
@@ -33,18 +33,7 @@
 
 static int find_dvsec(struct pci_dev *dev, int dvsec_id)
 {
-       int vsec = 0;
-       u16 vendor, id;
-
-       while ((vsec = pci_find_next_ext_capability(dev, vsec,
-                                                   OCXL_EXT_CAP_ID_DVSEC))) {
-               pci_read_config_word(dev, vsec + OCXL_DVSEC_VENDOR_OFFSET,
-                               &vendor);
-               pci_read_config_word(dev, vsec + OCXL_DVSEC_ID_OFFSET, &id);
-               if (vendor == PCI_VENDOR_ID_IBM && id == dvsec_id)
-                       return vsec;
-       }
-       return 0;
+       return pci_find_dvsec_capability(dev, PCI_VENDOR_ID_IBM, dvsec_id);
 }
 
 static int find_dvsec_afu_ctrl(struct pci_dev *dev, u8 afu_idx)
-- 
2.33.0