Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3df425f3 authored by John Crispin's avatar John Crispin Committed by Ralf Baechle
Browse files

OF: PCI: const usage needed by MIPS 



On MIPS we want to call of_irq_map_pci from inside

arch/mips/include/asm/pci.h:extern int pcibios_map_irq(
				const struct pci_dev *dev, u8 slot, u8 pin);
For this to work we need to change several functions to const usage.

Signed-off-by: default avatarJohn Crispin <blogic@openwrt.org>
Cc: linux-pci@vger.kernel.org
Cc: devicetree-discuss@lists.ozlabs.org
Cc: linux-mips@linux-mips.org
Acked-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Acked-by: default avatarGrant Likely <grant.likely@secretlab.ca>
Patchwork: https://patchwork.linux-mips.org/patch/3710/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 6697c693

drivers/of/of_pci_irq.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/pci/pci.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

include/linux/of_pci.h

+1 −1
Original line number Diff line number Diff line
@@ -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,

include/linux/pci.h

+3 −2
Original line number Diff line number Diff line
@@ -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;

}