summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjhb <jhb@FreeBSD.org>2012-03-03 18:03:50 +0000
committerjhb <jhb@FreeBSD.org>2012-03-03 18:03:50 +0000
commit5d1c8921393a5655a4c943e92a3296efc6dc3acd (patch)
tree0006720b410f34073a9f5a777549e95204710160
parent3ffccacd98d5b3ddefeed4e23bc98327a06c5001 (diff)
downloadFreeBSD-src-5d1c8921393a5655a4c943e92a3296efc6dc3acd.zip
FreeBSD-src-5d1c8921393a5655a4c943e92a3296efc6dc3acd.tar.gz
Use pci_find_cap() instead of pci_find_extcap() to locate PCI
find capabilities as the latter API is deprecated for this purpose. MFC after: 2 weeks
-rw-r--r--sys/dev/oce/oce_hw.c8
-rw-r--r--sys/dev/virtio/pci/virtio_pci.c4
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/dev/oce/oce_hw.c b/sys/dev/oce/oce_hw.c
index d279e5e..e68ba7a 100644
--- a/sys/dev/oce/oce_hw.c
+++ b/sys/dev/oce/oce_hw.c
@@ -203,12 +203,12 @@ void oce_get_pci_capabilities(POCE_SOFTC sc)
{
uint32_t val;
- if (pci_find_extcap(sc->dev, PCIY_PCIX, &val) == 0) {
+ if (pci_find_cap(sc->dev, PCIY_PCIX, &val) == 0) {
if (val != 0)
sc->flags |= OCE_FLAGS_PCIX;
}
- if (pci_find_extcap(sc->dev, PCIY_EXPRESS, &val) == 0) {
+ if (pci_find_cap(sc->dev, PCIY_EXPRESS, &val) == 0) {
if (val != 0) {
uint16_t link_status =
pci_read_config(sc->dev, val + 0x12, 2);
@@ -219,12 +219,12 @@ void oce_get_pci_capabilities(POCE_SOFTC sc)
}
}
- if (pci_find_extcap(sc->dev, PCIY_MSI, &val) == 0) {
+ if (pci_find_cap(sc->dev, PCIY_MSI, &val) == 0) {
if (val != 0)
sc->flags |= OCE_FLAGS_MSI_CAPABLE;
}
- if (pci_find_extcap(sc->dev, PCIY_MSIX, &val) == 0) {
+ if (pci_find_cap(sc->dev, PCIY_MSIX, &val) == 0) {
if (val != 0) {
val = pci_msix_count(sc->dev);
sc->flags |= OCE_FLAGS_MSIX_CAPABLE;
diff --git a/sys/dev/virtio/pci/virtio_pci.c b/sys/dev/virtio/pci/virtio_pci.c
index dd348a5..c71b5a9 100644
--- a/sys/dev/virtio/pci/virtio_pci.c
+++ b/sys/dev/virtio/pci/virtio_pci.c
@@ -251,10 +251,10 @@ vtpci_attach(device_t dev)
return (ENXIO);
}
- if (pci_find_extcap(dev, PCIY_MSI, NULL) != 0)
+ if (pci_find_cap(dev, PCIY_MSI, NULL) != 0)
sc->vtpci_flags |= VIRTIO_PCI_FLAG_NO_MSI;
- if (pci_find_extcap(dev, PCIY_MSIX, NULL) == 0) {
+ if (pci_find_cap(dev, PCIY_MSIX, NULL) == 0) {
rid = PCIR_BAR(1);
sc->vtpci_msix_res = bus_alloc_resource_any(dev,
SYS_RES_MEMORY, &rid, RF_ACTIVE);
OpenPOWER on IntegriCloud