The branch stable/13 has been updated by imp:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=c69e5d9b3ed95f34cbaaf8f822e6c288844dcb16

commit c69e5d9b3ed95f34cbaaf8f822e6c288844dcb16
Author:     Warner Losh <[email protected]>
AuthorDate: 2022-07-08 17:53:31 +0000
Commit:     Warner Losh <[email protected]>
CommitDate: 2022-10-02 04:25:53 +0000

    Mark cfg as __unused to avoid ifdef soup
    
    Sponsored by:           Netflix
    
    (cherry picked from commit 09b966ee7c6389db635f793377cc50cb2fcb4962)
---
 sys/dev/pci/pci.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c
index ca7de6c28ad5..97f6f4da1821 100644
--- a/sys/dev/pci/pci.c
+++ b/sys/dev/pci/pci.c
@@ -5652,7 +5652,7 @@ pci_release_resource(device_t dev, device_t child, int 
type, int rid,
 {
        struct pci_devinfo *dinfo;
        struct resource_list *rl;
-       pcicfgregs *cfg;
+       pcicfgregs *cfg __unused;
 
        if (device_get_parent(child) != dev)
                return (BUS_RELEASE_RESOURCE(device_get_parent(dev), child,
@@ -5662,7 +5662,7 @@ pci_release_resource(device_t dev, device_t child, int 
type, int rid,
        cfg = &dinfo->cfg;
 
 #ifdef PCI_IOV
-       if (dinfo->cfg.flags & PCICFG_VF) {
+       if (cfg->flags & PCICFG_VF) {
                switch (type) {
                /* VFs can't have I/O BARs. */
                case SYS_RES_IOPORT:

Reply via email to