diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2021-05-04 18:43:23 +0300 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2021-05-04 18:43:23 +0300 |
| commit | 3c5b307a1ee241cd69ad4e1f045863da593d8f6f (patch) | |
| tree | d9d3261dcecb79094f6c04ba098ac35359fd7dde /include | |
| parent | acd18f12d964e0db51a62ee754d3ab0b184a9308 (diff) | |
| parent | e00dc69b5f17c444a38cd9745a0f76bc989b3af4 (diff) | |
| download | linux-3c5b307a1ee241cd69ad4e1f045863da593d8f6f.tar.xz | |
Merge branch 'pci/vpd'
- Remove obsolete Broadcom NIC VPD length-limiting quirk (Heiner Kallweit)
- Remove sysfs VPD size checking dead code (Heiner Kallweit)
- Convert VPF sysfs file to static attribute (Heiner Kallweit)
- Remove unnecessary pci_set_vpd_size() (Heiner Kallweit)
- Tone down "missing VPD" message (Heiner Kallweit)
* pci/vpd:
PCI: Allow VPD access for QLogic ISP2722
PCI/VPD: Add helper pci_get_func0_dev()
PCI/VPD: Remove pci_vpd_find_tag() SRDT handling
PCI/VPD: Remove pci_vpd_find_tag() 'offset' argument
PCI/VPD: Change pci_vpd_init() return type to void
PCI/VPD: Make missing VPD message less alarming
PCI/VPD: Remove pci_set_vpd_size()
PCI/VPD: Remove sysfs accessor size checking dead code
PCI/VPD: Remove obsolete Broadcom NIC quirk
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/pci.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h index 4eaa773115da..b62006f216f9 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -1303,7 +1303,6 @@ void pci_unlock_rescan_remove(void); /* Vital Product Data routines */ ssize_t pci_read_vpd(struct pci_dev *dev, loff_t pos, size_t count, void *buf); ssize_t pci_write_vpd(struct pci_dev *dev, loff_t pos, size_t count, const void *buf); -int pci_set_vpd_size(struct pci_dev *dev, size_t len); /* Helper functions for low-level code (drivers/pci/setup-[bus,res].c) */ resource_size_t pcibios_retrieve_fw_addr(struct pci_dev *dev, int idx); @@ -2312,14 +2311,13 @@ static inline u8 pci_vpd_info_field_size(const u8 *info_field) /** * pci_vpd_find_tag - Locates the Resource Data Type tag provided * @buf: Pointer to buffered vpd data - * @off: The offset into the buffer at which to begin the search * @len: The length of the vpd buffer * @rdt: The Resource Data Type to search for * * Returns the index where the Resource Data Type was found or * -ENOENT otherwise. */ -int pci_vpd_find_tag(const u8 *buf, unsigned int off, unsigned int len, u8 rdt); +int pci_vpd_find_tag(const u8 *buf, unsigned int len, u8 rdt); /** * pci_vpd_find_info_keyword - Locates an information field keyword in the VPD |