Commit f9ea894c authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Bjorn Helgaas
Browse files

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: default avatarBjorn Helgaas <bhelgaas@google.com>
parent 99605857

drivers/pci/pci.h

+0 −17
Original line number Diff line number Diff line
@@ -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);

drivers/pci/vpd.c

+17 −0
Original line number Diff line number Diff line
@@ -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