diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2018-04-04 13:28:40 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <helgaas@kernel.org> | 2018-04-04 13:28:40 -0500 |
| commit | c8afd5ef001b85034c31025686d3b7419103d729 (patch) | |
| tree | 4d499a025d9fa1b32a0807771006d3b3770c3642 /drivers/pci/pci.h | |
| parent | a4b88505ac1f77cf4fa75fa6845fe95aa43aac9e (diff) | |
| parent | f9ea894ca59a7abd931e52700bbe12e87e891c1e (diff) | |
Merge branch 'pci/vpd'
- consolidate VPD code in vpd.c (Bjorn Helgaas)
* pci/vpd:
PCI/VPD: Move VPD structures to vpd.c
PCI/VPD: Move VPD quirks to vpd.c
PCI/VPD: Move VPD sysfs code to vpd.c
PCI/VPD: Move VPD access code to vpd.c
Diffstat (limited to 'drivers/pci/pci.h')
| -rw-r--r-- | drivers/pci/pci.h | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h index 6722302db194..023f7cf25bff 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h @@ -105,25 +105,10 @@ static inline bool pci_power_manageable(struct pci_dev *pci_dev) return !pci_has_subordinate(pci_dev) || pci_dev->bridge_d3; } -struct pci_vpd_ops { - ssize_t (*read)(struct pci_dev *dev, loff_t pos, size_t count, void *buf); - ssize_t (*write)(struct pci_dev *dev, loff_t pos, size_t count, const void *buf); - int (*set_size)(struct pci_dev *dev, size_t len); -}; - -struct pci_vpd { - const struct pci_vpd_ops *ops; - struct bin_attribute *attr; /* Descriptor for sysfs VPD entry */ - struct mutex lock; - unsigned int len; - u16 flag; - u8 cap; - u8 busy:1; - u8 valid:1; -}; - int pci_vpd_init(struct pci_dev *dev); void pci_vpd_release(struct pci_dev *dev); +void pcie_vpd_create_sysfs_dev_files(struct pci_dev *dev); +void pcie_vpd_remove_sysfs_dev_files(struct pci_dev *dev); /* PCI /proc functions */ #ifdef CONFIG_PROC_FS |