diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2013-12-20 12:41:40 -0700 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-12-20 12:41:40 -0700 |
| commit | 47e0ab3f39aec53d9b7ac77dbe11a645e40583f9 (patch) | |
| tree | 2d7c413a4bf808851f990416ce75c2c978332323 /include/linux/pci.h | |
| parent | f72e11123ba122c4ed8fcee52ab57cf3fbe81178 (diff) | |
| parent | 52179dc9edc3b7a2b3bb01cbb1b6c96f6d05fc73 (diff) | |
| download | linux-stable-47e0ab3f39aec53d9b7ac77dbe11a645e40583f9.tar.gz linux-stable-47e0ab3f39aec53d9b7ac77dbe11a645e40583f9.tar.bz2 linux-stable-47e0ab3f39aec53d9b7ac77dbe11a645e40583f9.zip | |
Merge branch 'pci/msi' into next
* pci/msi:
PCI/MSI: Make pci_enable_msi/msix() 'nvec' argument type as int
PCI/MSI: Return -ENOSYS for unimplemented interfaces, not -1
PCI/MSI: Return msix_capability_init() failure if populate_msi_sysfs() fails
s390/PCI: Remove superfluous check of MSI type
s390/PCI: Fix single MSI only check
PCI/MSI: Export MSI mode using attributes, not kobjects
Diffstat (limited to 'include/linux/pci.h')
| -rw-r--r-- | include/linux/pci.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h index f16fb1f01317..9172cc2a3041 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -352,7 +352,7 @@ struct pci_dev { struct bin_attribute *res_attr_wc[DEVICE_COUNT_RESOURCE]; /* sysfs file for WC mapping of resources */ #ifdef CONFIG_PCI_MSI struct list_head msi_list; - struct kset *msi_kset; + const struct attribute_group **msi_irq_groups; #endif struct pci_vpd *vpd; #ifdef CONFIG_PCI_ATS @@ -1167,15 +1167,15 @@ struct msix_entry { #ifndef CONFIG_PCI_MSI -static inline int pci_enable_msi_block(struct pci_dev *dev, unsigned int nvec) +static inline int pci_enable_msi_block(struct pci_dev *dev, int nvec) { - return -1; + return -ENOSYS; } static inline int -pci_enable_msi_block_auto(struct pci_dev *dev, unsigned int *maxvec) +pci_enable_msi_block_auto(struct pci_dev *dev, int *maxvec) { - return -1; + return -ENOSYS; } static inline void pci_msi_shutdown(struct pci_dev *dev) @@ -1190,7 +1190,7 @@ static inline int pci_msix_table_size(struct pci_dev *dev) static inline int pci_enable_msix(struct pci_dev *dev, struct msix_entry *entries, int nvec) { - return -1; + return -ENOSYS; } static inline void pci_msix_shutdown(struct pci_dev *dev) @@ -1208,8 +1208,8 @@ static inline int pci_msi_enabled(void) return 0; } #else -int pci_enable_msi_block(struct pci_dev *dev, unsigned int nvec); -int pci_enable_msi_block_auto(struct pci_dev *dev, unsigned int *maxvec); +int pci_enable_msi_block(struct pci_dev *dev, int nvec); +int pci_enable_msi_block_auto(struct pci_dev *dev, int *maxvec); void pci_msi_shutdown(struct pci_dev *dev); void pci_disable_msi(struct pci_dev *dev); int pci_msix_table_size(struct pci_dev *dev); |