Now that the DT PCI code is merged into drivers/pci, of_irq_parse_pci can be static. Cc: Bjorn Helgaas <bhelgaas@xxxxxxxxxx> Cc: Frank Rowand <frowand.list@xxxxxxxxx> Cc: linux-pci@xxxxxxxxxxxxxxx Signed-off-by: Rob Herring <robh@xxxxxxxxxx> --- drivers/pci/of.c | 3 +-- include/linux/of_pci.h | 6 ------ 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/drivers/pci/of.c b/drivers/pci/of.c index 859a43dd098d..511a5ec83f6e 100644 --- a/drivers/pci/of.c +++ b/drivers/pci/of.c @@ -479,7 +479,7 @@ int of_pci_map_rid(struct device_node *np, u32 rid, * PCI tree until an device-node is found, at which point it will finish * resolving using the OF tree walking. */ -int of_irq_parse_pci(const struct pci_dev *pdev, struct of_phandle_args *out_irq) +static int of_irq_parse_pci(const struct pci_dev *pdev, struct of_phandle_args *out_irq) { struct device_node *dn, *ppnode; struct pci_dev *ppdev; @@ -569,7 +569,6 @@ int of_irq_parse_pci(const struct pci_dev *pdev, struct of_phandle_args *out_irq } return rc; } -EXPORT_SYMBOL_GPL(of_irq_parse_pci); /** * of_irq_parse_and_map_pci() - Decode a PCI irq from the device tree and map to a virq diff --git a/include/linux/of_pci.h b/include/linux/of_pci.h index f0e129e848ea..88865e0ebf4d 100644 --- a/include/linux/of_pci.h +++ b/include/linux/of_pci.h @@ -10,7 +10,6 @@ struct of_phandle_args; struct device_node; #if IS_ENABLED(CONFIG_OF) && IS_ENABLED(CONFIG_PCI) -int of_irq_parse_pci(const struct pci_dev *pdev, struct of_phandle_args *out_irq); 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) { -- 2.14.1 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html