diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2012-06-13 19:04:54 -0400 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2012-06-13 19:04:54 -0400 |
| commit | cc2fa3fa320d5f40a12713c104bbe5d3da4636e4 (patch) | |
| tree | 342445a784c566116505ab8c9e7a24803a6e70c4 /drivers/pci/pci.h | |
| parent | 10c480933d0ad2ea27630cbaa723a5d33dbece00 (diff) | |
| parent | a0dee2ed0cdc666b5622f1fc74979355a6b36850 (diff) | |
Merge branch 'topic/alex-vfio-prep' into next
* topic/alex-vfio-prep:
PCI: misc pci_reg additions
PCI: create common pcibios_err_to_errno
PCI: export pci_user functions for use by other drivers
PCI: add ACS validation utility
PCI: add PCI DMA source ID quirk
Diffstat (limited to 'drivers/pci/pci.h')
| -rw-r--r-- | drivers/pci/pci.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h index 1c56ea8110b1..4884d77d33b6 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h | |||
| @@ -86,13 +86,6 @@ static inline bool pci_is_bridge(struct pci_dev *pci_dev) | |||
| 86 | return !!(pci_dev->subordinate); | 86 | return !!(pci_dev->subordinate); |
| 87 | } | 87 | } |
| 88 | 88 | ||
| 89 | extern int pci_user_read_config_byte(struct pci_dev *dev, int where, u8 *val); | ||
| 90 | extern int pci_user_read_config_word(struct pci_dev *dev, int where, u16 *val); | ||
| 91 | extern int pci_user_read_config_dword(struct pci_dev *dev, int where, u32 *val); | ||
| 92 | extern int pci_user_write_config_byte(struct pci_dev *dev, int where, u8 val); | ||
| 93 | extern int pci_user_write_config_word(struct pci_dev *dev, int where, u16 val); | ||
| 94 | extern int pci_user_write_config_dword(struct pci_dev *dev, int where, u32 val); | ||
| 95 | |||
| 96 | struct pci_vpd_ops { | 89 | struct pci_vpd_ops { |
| 97 | ssize_t (*read)(struct pci_dev *dev, loff_t pos, size_t count, void *buf); | 90 | ssize_t (*read)(struct pci_dev *dev, loff_t pos, size_t count, void *buf); |
| 98 | ssize_t (*write)(struct pci_dev *dev, loff_t pos, size_t count, const void *buf); | 91 | ssize_t (*write)(struct pci_dev *dev, loff_t pos, size_t count, const void *buf); |