diff options
| author | Alexander Gordeev <agordeev@redhat.com> | 2013-12-16 03:34:58 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-12-20 11:45:05 -0500 |
| commit | 52179dc9edc3b7a2b3bb01cbb1b6c96f6d05fc73 (patch) | |
| tree | b331aa42207a68cafce0bb8758a9474022d52f96 /include/linux | |
| parent | 8ec5db6b20c860ddd1311c794b38c98ce86ac7ae (diff) | |
PCI/MSI: Make pci_enable_msi/msix() 'nvec' argument type as int
Make pci_enable_msi_block(), pci_enable_msi_block_auto() and
pci_enable_msix() consistent with regard to the type of 'nvec' argument.
Signed-off-by: Alexander Gordeev <agordeev@redhat.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/pci.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h index 3c95efd12f3c..7c34c3913bcb 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h | |||
| @@ -1154,13 +1154,13 @@ struct msix_entry { | |||
| 1154 | 1154 | ||
| 1155 | 1155 | ||
| 1156 | #ifndef CONFIG_PCI_MSI | 1156 | #ifndef CONFIG_PCI_MSI |
| 1157 | static inline int pci_enable_msi_block(struct pci_dev *dev, unsigned int nvec) | 1157 | static inline int pci_enable_msi_block(struct pci_dev *dev, int nvec) |
| 1158 | { | 1158 | { |
| 1159 | return -ENOSYS; | 1159 | return -ENOSYS; |
| 1160 | } | 1160 | } |
| 1161 | 1161 | ||
| 1162 | static inline int | 1162 | static inline int |
| 1163 | pci_enable_msi_block_auto(struct pci_dev *dev, unsigned int *maxvec) | 1163 | pci_enable_msi_block_auto(struct pci_dev *dev, int *maxvec) |
| 1164 | { | 1164 | { |
| 1165 | return -ENOSYS; | 1165 | return -ENOSYS; |
| 1166 | } | 1166 | } |
| @@ -1195,8 +1195,8 @@ static inline int pci_msi_enabled(void) | |||
| 1195 | return 0; | 1195 | return 0; |
| 1196 | } | 1196 | } |
| 1197 | #else | 1197 | #else |
| 1198 | int pci_enable_msi_block(struct pci_dev *dev, unsigned int nvec); | 1198 | int pci_enable_msi_block(struct pci_dev *dev, int nvec); |
| 1199 | int pci_enable_msi_block_auto(struct pci_dev *dev, unsigned int *maxvec); | 1199 | int pci_enable_msi_block_auto(struct pci_dev *dev, int *maxvec); |
| 1200 | void pci_msi_shutdown(struct pci_dev *dev); | 1200 | void pci_msi_shutdown(struct pci_dev *dev); |
| 1201 | void pci_disable_msi(struct pci_dev *dev); | 1201 | void pci_disable_msi(struct pci_dev *dev); |
| 1202 | int pci_msix_table_size(struct pci_dev *dev); | 1202 | int pci_msix_table_size(struct pci_dev *dev); |
