On Sun, Mar 18, 2018 at 01:58:06PM +0100, Bjørn Mork wrote:
> 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: Bjørn Mork <bjorn@xxxxxxx>
Applied to pci/misc for v4.17, thanks!
> ---
> I noticed this as a missing pci_bus_to_OF_node stub. But adding a
> stub which does pretty much the same as the real thing didn't make much
> sense to me. Same goes for the existing pci_device_to_OF_node stub,
> which is why I replace that too.
>
>
> include/linux/pci.h | 24 +++++++++++-------------
> 1 file changed, 11 insertions(+), 13 deletions(-)
>
> diff --git a/include/linux/pci.h b/include/linux/pci.h
> index 024a1beda008..d0396da9160e 100644
> --- a/include/linux/pci.h
> +++ b/include/linux/pci.h
> @@ -2182,24 +2182,11 @@ int pci_parse_request_of_pci_ranges(struct device *dev,
> /* Arch may override this (weak) */
> 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 */
> 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_set_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 *
> pci_host_bridge_of_msi_domain(struct pci_bus *bus) { return NULL; }
> 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 */
>
> +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
> struct irq_domain *pci_host_bridge_acpi_msi_domain(struct pci_bus *bus);
>
> --
> 2.11.0
>
