diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2022-01-13 09:57:43 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2022-01-13 09:57:43 -0600 |
| commit | fb6c45130a4ad48cc7bf27399fe812379de013a8 (patch) | |
| tree | c86386c9376bcd511491efd5ea70579663d04a40 /include/linux/pci.h | |
| parent | 7498e41fb537d7174d12f564e9dd7009b3a02c5f (diff) | |
| parent | 346865f0745357f9f4704614ce1d9a8e6f27dbc4 (diff) | |
| download | linux-fb6c45130a4ad48cc7bf27399fe812379de013a8.tar.gz linux-fb6c45130a4ad48cc7bf27399fe812379de013a8.tar.bz2 linux-fb6c45130a4ad48cc7bf27399fe812379de013a8.zip | |
Merge branch 'pci/enumeration'
- Use pci_find_vsec_capability() instead of open-coding it (Andy
Shevchenko)
- Convert pci_dev_present() stub from macro to static inline to avoid
'unused variable' errors (Hans de Goede)
- Convert sysfs slot attributes from default_attrs to default_groups (Greg
Kroah-Hartman)
- Use DWORD accesses for LTR, L1 SS to avoid BayHub OZ711LV2 erratum (Rajat
Jain)
- Remove unnecessary initialization of static variables (Longji Guo)
* pci/enumeration:
x86/PCI: Remove initialization of static variables to false
PCI: Use DWORD accesses for LTR, L1 SS to avoid erratum
PCI/sysfs: Use default_groups in kobj_type for slot attrs
PCI: Convert pci_dev_present() stub to static inline
PCI: Use pci_find_vsec_capability() when looking for TBT devices
Diffstat (limited to 'include/linux/pci.h')
| -rw-r--r-- | include/linux/pci.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h index 18a75c8e615c..7d825637d7ca 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -1775,7 +1775,10 @@ static inline struct pci_dev *pci_get_class(unsigned int class, struct pci_dev *from) { return NULL; } -#define pci_dev_present(ids) (0) + +static inline int pci_dev_present(const struct pci_device_id *ids) +{ return 0; } + #define no_pci_devices() (1) #define pci_dev_put(dev) do { } while (0) |
