diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2018-03-19 13:06:34 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <helgaas@kernel.org> | 2018-03-19 13:06:34 -0500 |
| commit | f9ea894ca59a7abd931e52700bbe12e87e891c1e (patch) | |
| tree | d5e19b92840d5d04d59e7bf4b43196fa1b8511d0 | |
| parent | 996058573b22a7d4e54e281fc624db4b32d85eb4 (diff) | |
| download | talos-op-linux-f9ea894ca59a7abd931e52700bbe12e87e891c1e.tar.gz talos-op-linux-f9ea894ca59a7abd931e52700bbe12e87e891c1e.zip | |
PCI/VPD: Move VPD structures to vpd.c
The VPD-related structures are only used in vpd.c, so move them from
drivers/pci/pci.h to vpd.c. No functional change intended.
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
| -rw-r--r-- | drivers/pci/pci.h | 17 | ||||
| -rw-r--r-- | drivers/pci/vpd.c | 17 |
2 files changed, 17 insertions, 17 deletions
diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h index 1191320a44d5..9a41a6399967 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h @@ -104,23 +104,6 @@ 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); diff --git a/drivers/pci/vpd.c b/drivers/pci/vpd.c index 901b0bedcc5d..f24c3600be73 100644 --- a/drivers/pci/vpd.c +++ b/drivers/pci/vpd.c @@ -14,6 +14,23 @@ /* VPD access through PCI 2.2+ VPD capability */ +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; + unsigned int busy:1; + unsigned int valid:1; +}; + /** * pci_read_vpd - Read one entry from Vital Product Data * @dev: pci device struct |
