summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Herring <robh@kernel.org>2018-01-05 00:12:15 +0300
committerBjorn Helgaas <bhelgaas@google.com>2018-01-25 17:48:20 +0300
commit7e2978430f3ad28f508da93cc2fb3d1cfda7b2da (patch)
treef83fd51da84787b4f18e771bc0a9b28205f06614
parent59f47eff03a08cd2d91310f1c15a5343fa0071e5 (diff)
downloadlinux-7e2978430f3ad28f508da93cc2fb3d1cfda7b2da.tar.xz
PCI: Make of_irq_parse_pci() static
Now that the DT PCI code is merged into drivers/pci, of_irq_parse_pci() can be static. Signed-off-by: Rob Herring <robh@kernel.org> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Cc: Frank Rowand <frowand.list@gmail.com>
-rw-r--r--drivers/pci/of.c3
-rw-r--r--include/linux/of_pci.h6
2 files changed, 1 insertions, 8 deletions
diff --git a/drivers/pci/of.c b/drivers/pci/of.c
index 79441a556f6f..e81835bdf4fa 100644
--- a/drivers/pci/of.c
+++ b/drivers/pci/of.c
@@ -480,7 +480,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;
@@ -574,7 +574,6 @@ err:
}
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)
{