| Message ID | 1422927444-31292-1-git-send-email-haokexin@gmail.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
On Tue, Feb 03, 2015 at 09:37:24AM +0800, Kevin Hao wrote: > Add a stub for pci_device_to_OF_node() so drivers don't need to > use #ifdef CONFIG_OF around calls to it. > > Signed-off-by: Kevin Hao <haokexin@gmail.com> > Acked-by: Bjorn Helgaas <bhelgaas@google.com> Applied to pci/misc for v3.20, thanks! > --- > Hi Bjorn, > > Here is the revised version with the update of the subject and commit log > in case that you want to take it for 3.20. Otherwise we will merge this > version to powerpc tree during the 3.21 cycle. > > include/linux/pci.h | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/include/linux/pci.h b/include/linux/pci.h > index 8323cbf93913..421eb6a9e600 100644 > --- a/include/linux/pci.h > +++ b/include/linux/pci.h > @@ -1863,6 +1863,8 @@ 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; } > #endif /* CONFIG_OF */ > > #ifdef CONFIG_EEH > -- > 1.9.3 >
diff --git a/include/linux/pci.h b/include/linux/pci.h index 8323cbf93913..421eb6a9e600 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -1863,6 +1863,8 @@ 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; } #endif /* CONFIG_OF */ #ifdef CONFIG_EEH