diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2024-01-10 06:21:44 +0300 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2024-01-10 06:21:44 +0300 |
| commit | 3601311593eb44d34f142b993cb6f38f9a7863b3 (patch) | |
| tree | abf5105cfc626bdf2516cace485fd538b1d1267e /include/linux/pci.h | |
| parent | e16bf7e015d75fdd805528bedaf285fcb71dad2a (diff) | |
| parent | dc97f6344f205b0dfa144e1b3e16d6dc05383d57 (diff) | |
| download | linux-3601311593eb44d34f142b993cb6f38f9a7863b3.tar.xz | |
Merge branch 'for-6.8/cxl-cper' into for-6.8/cxl
Pick up the CPER to CXL driver integration work for v6.8. Some
additional cleanup of cper_estatus_print() messages is needed, but that
is to be handled incrementally.
Diffstat (limited to 'include/linux/pci.h')
| -rw-r--r-- | include/linux/pci.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h index 504a4ba2c29e..bf6c02bee49f 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -1170,6 +1170,7 @@ int pci_get_interrupt_pin(struct pci_dev *dev, struct pci_dev **bridge); u8 pci_common_swizzle(struct pci_dev *dev, u8 *pinp); struct pci_dev *pci_dev_get(struct pci_dev *dev); void pci_dev_put(struct pci_dev *dev); +DEFINE_FREE(pci_dev_put, struct pci_dev *, if (_T) pci_dev_put(_T)) void pci_remove_bus(struct pci_bus *b); void pci_stop_and_remove_bus_device(struct pci_dev *dev); void pci_stop_and_remove_bus_device_locked(struct pci_dev *dev); @@ -1875,6 +1876,7 @@ void pci_cfg_access_unlock(struct pci_dev *dev); void pci_dev_lock(struct pci_dev *dev); int pci_dev_trylock(struct pci_dev *dev); void pci_dev_unlock(struct pci_dev *dev); +DEFINE_GUARD(pci_dev, struct pci_dev *, pci_dev_lock(_T), pci_dev_unlock(_T)) /* * PCI domain support. Sometimes called PCI segment (eg by ACPI), |