From 6b8174b8d35d8121873df30e6426a6458e15eb6e Mon Sep 17 00:00:00 2001
From: John Crispin <blogic@openwrt.org>
Date: Thu, 12 Apr 2012 17:33:07 +0200
Subject: [PATCH] --- yaml --- r: 309078 b: refs/heads/master c:
 3df425f316fb5c5e90236ff22b6e6616b3516af0 h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/of/of_pci_irq.c | 2 +-
 trunk/drivers/pci/pci.c       | 2 +-
 trunk/include/linux/of_pci.h  | 2 +-
 trunk/include/linux/pci.h     | 5 +++--
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 8bfb9dcf9401..2e94a34ebda3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6697c6933048aabe94f0049070f7ec09cd52baa8
+refs/heads/master: 3df425f316fb5c5e90236ff22b6e6616b3516af0
diff --git a/trunk/drivers/of/of_pci_irq.c b/trunk/drivers/of/of_pci_irq.c
index 93125163dea2..677053813211 100644
--- a/trunk/drivers/of/of_pci_irq.c
+++ b/trunk/drivers/of/of_pci_irq.c
@@ -15,7 +15,7 @@
  * PCI tree until an device-node is found, at which point it will finish
  * resolving using the OF tree walking.
  */
-int of_irq_map_pci(struct pci_dev *pdev, struct of_irq *out_irq)
+int of_irq_map_pci(const struct pci_dev *pdev, struct of_irq *out_irq)
 {
 	struct device_node *dn, *ppnode;
 	struct pci_dev *ppdev;
diff --git a/trunk/drivers/pci/pci.c b/trunk/drivers/pci/pci.c
index 111569ccab43..8b91fe741f6a 100644
--- a/trunk/drivers/pci/pci.c
+++ b/trunk/drivers/pci/pci.c
@@ -2369,7 +2369,7 @@ void pci_enable_acs(struct pci_dev *dev)
  * number is always 0 (see the Implementation Note in section 2.2.8.1 of
  * the PCI Express Base Specification, Revision 2.1)
  */
-u8 pci_swizzle_interrupt_pin(struct pci_dev *dev, u8 pin)
+u8 pci_swizzle_interrupt_pin(const struct pci_dev *dev, u8 pin)
 {
 	int slot;
 
diff --git a/trunk/include/linux/of_pci.h b/trunk/include/linux/of_pci.h
index f93e21700d3e..bb115deb7612 100644
--- a/trunk/include/linux/of_pci.h
+++ b/trunk/include/linux/of_pci.h
@@ -5,7 +5,7 @@
 
 struct pci_dev;
 struct of_irq;
-int of_irq_map_pci(struct pci_dev *pdev, struct of_irq *out_irq);
+int of_irq_map_pci(const struct pci_dev *pdev, struct of_irq *out_irq);
 
 struct device_node;
 struct device_node *of_pci_find_child_device(struct device_node *parent,
diff --git a/trunk/include/linux/pci.h b/trunk/include/linux/pci.h
index e444f5b49118..3bbc77e20a61 100644
--- a/trunk/include/linux/pci.h
+++ b/trunk/include/linux/pci.h
@@ -680,7 +680,7 @@ int __must_check pci_bus_add_device(struct pci_dev *dev);
 void pci_read_bridge_bases(struct pci_bus *child);
 struct resource *pci_find_parent_resource(const struct pci_dev *dev,
 					  struct resource *res);
-u8 pci_swizzle_interrupt_pin(struct pci_dev *dev, u8 pin);
+u8 pci_swizzle_interrupt_pin(const struct pci_dev *dev, u8 pin);
 int pci_get_interrupt_pin(struct pci_dev *dev, struct pci_dev **bridge);
 u8 pci_common_swizzle(struct pci_dev *dev, u8 *pinp);
 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);
 /* Arch may override this (weak) */
 extern struct device_node * __weak pcibios_get_phb_of_node(struct pci_bus *bus);
 
-static inline struct device_node *pci_device_to_OF_node(struct pci_dev *pdev)
+static inline struct device_node *
+pci_device_to_OF_node(const struct pci_dev *pdev)
 {
 	return pdev ? pdev->dev.of_node : NULL;
 }