diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2019-09-23 16:10:15 -0500 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2019-09-23 16:10:15 -0500 |
commit | 0ca0ef1042f49c4b457ca6cb48ebb5d1c0bcf003 (patch) | |
tree | 46e72f809ff4157dc75368c7c22185c5af030d63 /include | |
parent | 203104c8d5ece4e4c46096db40e04fe48b442cc6 (diff) | |
parent | 3b1b1ce3596458de0d5c28309954886a9cb6d5cc (diff) | |
download | linux-0ca0ef1042f49c4b457ca6cb48ebb5d1c0bcf003.tar.bz2 |
Merge branch 'pci/resource'
- Convert pci_resource_to_user() to a weak function to remove
HAVE_ARCH_PCI_RESOURCE_TO_USER #defines (Denis Efremov)
- Use PCI_SRIOV_NUM_BARS for idiomatic loop structure (Denis Efremov)
- Fix Resizable BAR size suspend/restore for 1MB BARs (Sumit Saxena)
- Correct "pci=resource_alignment" example in documentation (Alexey
Kardashevskiy)
* pci/resource:
PCI: Correct pci=resource_alignment parameter example
PCI: Restore Resizable BAR size bits correctly for 1MB BARs
PCI: Use PCI_SRIOV_NUM_BARS in loops instead of PCI_IOV_RESOURCE_END
PCI: Convert pci_resource_to_user() to a weak function
# Conflicts:
# drivers/pci/pci.c
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/pci.h | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h index 74bcbb31f79d..c1c2e4c7242a 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -1860,25 +1860,9 @@ static inline const char *pci_name(const struct pci_dev *pdev) return dev_name(&pdev->dev); } - -/* - * Some archs don't want to expose struct resource to userland as-is - * in sysfs and /proc - */ -#ifdef HAVE_ARCH_PCI_RESOURCE_TO_USER void pci_resource_to_user(const struct pci_dev *dev, int bar, const struct resource *rsrc, resource_size_t *start, resource_size_t *end); -#else -static inline void pci_resource_to_user(const struct pci_dev *dev, int bar, - const struct resource *rsrc, resource_size_t *start, - resource_size_t *end) -{ - *start = rsrc->start; - *end = rsrc->end; -} -#endif /* HAVE_ARCH_PCI_RESOURCE_TO_USER */ - /* * The world is not perfect and supplies us with broken PCI devices. |