diff options
| author | David S. Miller <davem@davemloft.net> | 2017-12-13 22:51:51 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-12-13 22:51:51 +0300 |
| commit | c132cd8e0511b6817af925ffe4e3ec9818843d59 (patch) | |
| tree | bf6cdf0f1817f4d0e7e34ef25b42441b9ac10e0a /include | |
| parent | ec94c2696f0bcd5ae92a553244e4ac30d2171a2d (diff) | |
| parent | 4cf964af0a7238f9d9dbebf4ec70a415ff5164e5 (diff) | |
| download | linux-c132cd8e0511b6817af925ffe4e3ec9818843d59.tar.xz | |
Merge branch 'r8169-device-managed'
Heiner Kallweit says:
====================
r8169: extend PCI core and switch to device-managed functions in probe
Probe error path and remove callback can be significantly simplified
by using device-managed functions. To be able to do this in the r8169
driver we need a device-managed version of pci_set_mwi first.
v2:
Change patch 1 based on Björn's review comments and add his Acked-by.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/pci.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h index 0403894147a3..483b780655bb 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -1072,6 +1072,7 @@ int pci_set_pcie_reset_state(struct pci_dev *dev, enum pcie_reset_state state); int pci_set_cacheline_size(struct pci_dev *dev); #define HAVE_PCI_SET_MWI int __must_check pci_set_mwi(struct pci_dev *dev); +int __must_check pcim_set_mwi(struct pci_dev *dev); int pci_try_set_mwi(struct pci_dev *dev); void pci_clear_mwi(struct pci_dev *dev); void pci_intx(struct pci_dev *dev, int enable); |