aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/pci.h
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2012-03-13 10:15:35 +1100
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2012-03-13 10:15:35 +1100
commitaba0eb84c87928992c021d33ef3ea59c931086b9 (patch)
treebdc323efc6773d0dcce4406ca275e9192eabb9b2 /include/linux/pci.h
parent7230c5644188cd9e3fb380cc97dde00c464a3ba7 (diff)
parent3780444c4fcec28c96ab7002858bb051215a5fc1 (diff)
downloadkernel_replicant_linux-aba0eb84c87928992c021d33ef3ea59c931086b9.tar.gz
kernel_replicant_linux-aba0eb84c87928992c021d33ef3ea59c931086b9.tar.bz2
kernel_replicant_linux-aba0eb84c87928992c021d33ef3ea59c931086b9.zip
Merge branch 'eeh' into next
Diffstat (limited to 'include/linux/pci.h')
-rw-r--r--include/linux/pci.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h
index a16b1df3deff..cfeee2a6a5ae 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -1647,6 +1647,13 @@ static inline void pci_set_bus_of_node(struct pci_bus *bus) { }
static inline void pci_release_bus_of_node(struct pci_bus *bus) { }
#endif /* CONFIG_OF */
+#ifdef CONFIG_EEH
+static inline struct eeh_dev *pci_dev_to_eeh_dev(struct pci_dev *pdev)
+{
+ return pdev->dev.archdata.edev;
+}
+#endif
+
/**
* pci_find_upstream_pcie_bridge - find upstream PCIe-to-PCI bridge of a device
* @pdev: the PCI device