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 17b7b5b01b4a..d8c379dba6ad 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h | |||
@@ -687,7 +687,7 @@ int __must_check pci_bus_add_device(struct pci_dev *dev); | |||
687 | void pci_read_bridge_bases(struct pci_bus *child); | 687 | void pci_read_bridge_bases(struct pci_bus *child); |
688 | struct resource *pci_find_parent_resource(const struct pci_dev *dev, | 688 | struct resource *pci_find_parent_resource(const struct pci_dev *dev, |
689 | struct resource *res); | 689 | struct resource *res); |
690 | u8 pci_swizzle_interrupt_pin(struct pci_dev *dev, u8 pin); | 690 | u8 pci_swizzle_interrupt_pin(const struct pci_dev *dev, u8 pin); |
691 | int pci_get_interrupt_pin(struct pci_dev *dev, struct pci_dev **bridge); | 691 | int pci_get_interrupt_pin(struct pci_dev *dev, struct pci_dev **bridge); |
692 | u8 pci_common_swizzle(struct pci_dev *dev, u8 *pinp); | 692 | u8 pci_common_swizzle(struct pci_dev *dev, u8 *pinp); |
693 | extern struct pci_dev *pci_dev_get(struct pci_dev *dev); | 693 | extern struct pci_dev *pci_dev_get(struct pci_dev *dev); |
@@ -1692,7 +1692,8 @@ extern void pci_release_bus_of_node(struct pci_bus *bus); | |||
1692 | /* Arch may override this (weak) */ | 1692 | /* Arch may override this (weak) */ |
1693 | extern struct device_node * __weak pcibios_get_phb_of_node(struct pci_bus *bus); | 1693 | extern struct device_node * __weak pcibios_get_phb_of_node(struct pci_bus *bus); |
1694 | 1694 | ||
1695 | static inline struct device_node *pci_device_to_OF_node(struct pci_dev *pdev) | 1695 | static inline struct device_node * |
1696 | pci_device_to_OF_node(const struct pci_dev *pdev) | ||
1696 | { | 1697 | { |
1697 | return pdev ? pdev->dev.of_node : NULL; | 1698 | return pdev ? pdev->dev.of_node : NULL; |
1698 | } | 1699 | } |