diff options
Diffstat (limited to 'include/linux/pci.h')
-rw-r--r-- | include/linux/pci.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h index a95aac7ad37f..5dbd15422b55 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h | |||
@@ -1158,7 +1158,6 @@ struct msix_entry { | |||
1158 | 1158 | ||
1159 | #ifdef CONFIG_PCI_MSI | 1159 | #ifdef CONFIG_PCI_MSI |
1160 | int pci_msi_vec_count(struct pci_dev *dev); | 1160 | int pci_msi_vec_count(struct pci_dev *dev); |
1161 | int pci_enable_msi_block(struct pci_dev *dev, int nvec); | ||
1162 | void pci_msi_shutdown(struct pci_dev *dev); | 1161 | void pci_msi_shutdown(struct pci_dev *dev); |
1163 | void pci_disable_msi(struct pci_dev *dev); | 1162 | void pci_disable_msi(struct pci_dev *dev); |
1164 | int pci_msix_vec_count(struct pci_dev *dev); | 1163 | int pci_msix_vec_count(struct pci_dev *dev); |
@@ -1188,8 +1187,6 @@ static inline int pci_enable_msix_exact(struct pci_dev *dev, | |||
1188 | } | 1187 | } |
1189 | #else | 1188 | #else |
1190 | static inline int pci_msi_vec_count(struct pci_dev *dev) { return -ENOSYS; } | 1189 | static inline int pci_msi_vec_count(struct pci_dev *dev) { return -ENOSYS; } |
1191 | static inline int pci_enable_msi_block(struct pci_dev *dev, int nvec) | ||
1192 | { return -ENOSYS; } | ||
1193 | static inline void pci_msi_shutdown(struct pci_dev *dev) { } | 1190 | static inline void pci_msi_shutdown(struct pci_dev *dev) { } |
1194 | static inline void pci_disable_msi(struct pci_dev *dev) { } | 1191 | static inline void pci_disable_msi(struct pci_dev *dev) { } |
1195 | static inline int pci_msix_vec_count(struct pci_dev *dev) { return -ENOSYS; } | 1192 | static inline int pci_msix_vec_count(struct pci_dev *dev) { return -ENOSYS; } |
@@ -1244,7 +1241,7 @@ static inline void pcie_set_ecrc_checking(struct pci_dev *dev) { } | |||
1244 | static inline void pcie_ecrc_get_policy(char *str) { } | 1241 | static inline void pcie_ecrc_get_policy(char *str) { } |
1245 | #endif | 1242 | #endif |
1246 | 1243 | ||
1247 | #define pci_enable_msi(pdev) pci_enable_msi_block(pdev, 1) | 1244 | #define pci_enable_msi(pdev) pci_enable_msi_exact(pdev, 1) |
1248 | 1245 | ||
1249 | #ifdef CONFIG_HT_IRQ | 1246 | #ifdef CONFIG_HT_IRQ |
1250 | /* The functions a driver should call */ | 1247 | /* The functions a driver should call */ |
@@ -1572,7 +1569,6 @@ extern unsigned long pci_hotplug_io_size; | |||
1572 | extern unsigned long pci_hotplug_mem_size; | 1569 | extern unsigned long pci_hotplug_mem_size; |
1573 | 1570 | ||
1574 | /* Architecture-specific versions may override these (weak) */ | 1571 | /* Architecture-specific versions may override these (weak) */ |
1575 | int pcibios_add_platform_entries(struct pci_dev *dev); | ||
1576 | void pcibios_disable_device(struct pci_dev *dev); | 1572 | void pcibios_disable_device(struct pci_dev *dev); |
1577 | void pcibios_set_master(struct pci_dev *dev); | 1573 | void pcibios_set_master(struct pci_dev *dev); |
1578 | int pcibios_set_pcie_reset_state(struct pci_dev *dev, | 1574 | int pcibios_set_pcie_reset_state(struct pci_dev *dev, |