diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2018-01-31 10:10:29 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <helgaas@kernel.org> | 2018-01-31 10:10:29 -0600 |
| commit | 6b290397afb89ac23f29be30c6637756d256f959 (patch) | |
| tree | 73910bf42b268ad6ed77469c3a802cd952031d72 /include | |
| parent | 3972b0e2c2abd027286b276fd07b7eea64cb7469 (diff) | |
| parent | 7e2978430f3ad28f508da93cc2fb3d1cfda7b2da (diff) | |
Merge branch 'pci/dt-resources' into next
* pci/dt-resources:
PCI: Make of_irq_parse_pci() static
powerpc/pci: Use of_irq_parse_and_map_pci() helper
PCI: Move OF-related PCI functions into PCI core
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/of_pci.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/include/linux/of_pci.h b/include/linux/of_pci.h index bf588a05d0d0..88865e0ebf4d 100644 --- a/include/linux/of_pci.h +++ b/include/linux/of_pci.h @@ -9,8 +9,7 @@ struct pci_dev; struct of_phandle_args; struct device_node; -#ifdef CONFIG_OF_PCI -int of_irq_parse_pci(const struct pci_dev *pdev, struct of_phandle_args *out_irq); +#if IS_ENABLED(CONFIG_OF) && IS_ENABLED(CONFIG_PCI) struct device_node *of_pci_find_child_device(struct device_node *parent, unsigned int devfn); int of_pci_get_devfn(struct device_node *np); @@ -23,11 +22,6 @@ int of_pci_map_rid(struct device_node *np, u32 rid, const char *map_name, const char *map_mask_name, struct device_node **target, u32 *id_out); #else -static inline int of_irq_parse_pci(const struct pci_dev *pdev, struct of_phandle_args *out_irq) -{ - return 0; -} - static inline struct device_node *of_pci_find_child_device(struct device_node *parent, unsigned int devfn) { |