Commit 7e297843 authored by Rob Herring's avatar Rob Herring Committed by Bjorn Helgaas
Browse files

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: default avatarRob Herring <robh@kernel.org>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Cc: Frank Rowand <frowand.list@gmail.com>
parent 59f47eff

drivers/pci/of.c

+1 −2
Original line number Diff line number Diff line
@@ -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 @@ 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

include/linux/of_pci.h

+0 −6
Original line number Diff line number Diff line
@@ -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)

{