Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ad32eb2d authored by Bjørn Mork's avatar Bjørn Mork Committed by Bjorn Helgaas
Browse files

PCI: Always define the of_node helpers 



Simply move these inline functions outside the ifdef instead of duplicating
them as stubs in the !OF case.  The struct device of_node field does not
depend on OF.

This also fixes the missing stubbed pci_bus_to_OF_node().

Signed-off-by: default avatarBjørn Mork <bjorn@mork.no>
Signed-off-by: default avatarBjorn Helgaas <helgaas@kernel.org>
parent df62ab5e

include/linux/pci.h

+11 −13
Original line number Original line Diff line number Diff line
@@ -2182,24 +2182,11 @@ int pci_parse_request_of_pci_ranges(struct device *dev, 
/* Arch may override this (weak) */

/* Arch may override this (weak) */

struct device_node *pcibios_get_phb_of_node(struct pci_bus *bus);

struct device_node *pcibios_get_phb_of_node(struct pci_bus *bus);





static inline struct device_node *

pci_device_to_OF_node(const struct pci_dev *pdev)

{

	return pdev ? pdev->dev.of_node : NULL;

}



static inline struct device_node *pci_bus_to_OF_node(struct pci_bus *bus)

{

	return bus ? bus->dev.of_node : NULL;

}



#else	/* CONFIG_OF */

#else	/* CONFIG_OF */

static inline void pci_set_of_node(struct pci_dev *dev) { }

static inline void pci_set_of_node(struct pci_dev *dev) { }

static inline void pci_release_of_node(struct pci_dev *dev) { }

static inline void pci_release_of_node(struct pci_dev *dev) { }

static inline void pci_set_bus_of_node(struct pci_bus *bus) { }

static inline void pci_set_bus_of_node(struct pci_bus *bus) { }

static inline void pci_release_bus_of_node(struct pci_bus *bus) { }

static inline void pci_release_bus_of_node(struct pci_bus *bus) { }

static inline struct device_node *

pci_device_to_OF_node(const struct pci_dev *pdev) { return NULL; }

static inline struct irq_domain *

static inline struct irq_domain *

pci_host_bridge_of_msi_domain(struct pci_bus *bus) { return NULL; }

pci_host_bridge_of_msi_domain(struct pci_bus *bus) { return NULL; }

static inline int pci_parse_request_of_pci_ranges(struct device *dev,

static inline int pci_parse_request_of_pci_ranges(struct device *dev,
@@ -2210,6 +2197,17 @@ static inline int pci_parse_request_of_pci_ranges(struct device *dev, 
}

}

#endif  /* CONFIG_OF */

#endif  /* CONFIG_OF */





static inline struct device_node *

pci_device_to_OF_node(const struct pci_dev *pdev)

{

	return pdev ? pdev->dev.of_node : NULL;

}



static inline struct device_node *pci_bus_to_OF_node(struct pci_bus *bus)

{

	return bus ? bus->dev.of_node : NULL;

}



#ifdef CONFIG_ACPI

#ifdef CONFIG_ACPI

struct irq_domain *pci_host_bridge_acpi_msi_domain(struct pci_bus *bus);

struct irq_domain *pci_host_bridge_acpi_msi_domain(struct pci_bus *bus);