diff options
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/of_pci.h | 2 | ||||
-rw-r--r-- | include/linux/pci.h | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/include/linux/of_pci.h b/include/linux/of_pci.h index f93e21700d3e..bb115deb7612 100644 --- a/include/linux/of_pci.h +++ b/include/linux/of_pci.h | |||
@@ -5,7 +5,7 @@ | |||
5 | 5 | ||
6 | struct pci_dev; | 6 | struct pci_dev; |
7 | struct of_irq; | 7 | struct of_irq; |
8 | int of_irq_map_pci(struct pci_dev *pdev, struct of_irq *out_irq); | 8 | int of_irq_map_pci(const struct pci_dev *pdev, struct of_irq *out_irq); |
9 | 9 | ||
10 | struct device_node; | 10 | struct device_node; |
11 | struct device_node *of_pci_find_child_device(struct device_node *parent, | 11 | struct device_node *of_pci_find_child_device(struct device_node *parent, |
diff --git a/include/linux/pci.h b/include/linux/pci.h index e444f5b49118..3bbc77e20a61 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h | |||
@@ -680,7 +680,7 @@ int __must_check pci_bus_add_device(struct pci_dev *dev); | |||
680 | void pci_read_bridge_bases(struct pci_bus *child); | 680 | void pci_read_bridge_bases(struct pci_bus *child); |
681 | struct resource *pci_find_parent_resource(const struct pci_dev *dev, | 681 | struct resource *pci_find_parent_resource(const struct pci_dev *dev, |
682 | struct resource *res); | 682 | struct resource *res); |
683 | u8 pci_swizzle_interrupt_pin(struct pci_dev *dev, u8 pin); | 683 | u8 pci_swizzle_interrupt_pin(const struct pci_dev *dev, u8 pin); |
684 | int pci_get_interrupt_pin(struct pci_dev *dev, struct pci_dev **bridge); | 684 | int pci_get_interrupt_pin(struct pci_dev *dev, struct pci_dev **bridge); |
685 | u8 pci_common_swizzle(struct pci_dev *dev, u8 *pinp); | 685 | u8 pci_common_swizzle(struct pci_dev *dev, u8 *pinp); |
686 | extern struct pci_dev *pci_dev_get(struct pci_dev *dev); | 686 | extern struct pci_dev *pci_dev_get(struct pci_dev *dev); |
@@ -1685,7 +1685,8 @@ extern void pci_release_bus_of_node(struct pci_bus *bus); | |||
1685 | /* Arch may override this (weak) */ | 1685 | /* Arch may override this (weak) */ |
1686 | extern struct device_node * __weak pcibios_get_phb_of_node(struct pci_bus *bus); | 1686 | extern struct device_node * __weak pcibios_get_phb_of_node(struct pci_bus *bus); |
1687 | 1687 | ||
1688 | static inline struct device_node *pci_device_to_OF_node(struct pci_dev *pdev) | 1688 | static inline struct device_node * |
1689 | pci_device_to_OF_node(const struct pci_dev *pdev) | ||
1689 | { | 1690 | { |
1690 | return pdev ? pdev->dev.of_node : NULL; | 1691 | return pdev ? pdev->dev.of_node : NULL; |
1691 | } | 1692 | } |