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

Commit 29090606 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

mips/PCI: replace pci_probe_only with pci_flags 



Some architectures (alpha, mips, powerpc) have an arch-specific
"pci_probe_only" flag.  Others use PCI_PROBE_ONLY in pci_flags for
the same purpose.  This moves mips to the pci_flags approach so
generic code can use the same test across all architectures.

CC: Ralf Baechle <ralf@linux-mips.org>
CC: linux-mips@linux-mips.org
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent e5b36841

arch/mips/include/asm/pci.h

+1 −2
Original line number Diff line number Diff line
@@ -92,6 +92,7 @@ extern int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma, 
#include <asm/scatterlist.h>

#include <linux/string.h>

#include <asm/io.h>

#include <asm-generic/pci-bridge.h>



struct pci_dev;
@@ -145,8 +146,6 @@ static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel) 
#define arch_setup_msi_irqs arch_setup_msi_irqs

#endif



extern int pci_probe_only;



extern char * (*pcibios_plat_setup)(char *str);



#endif /* _ASM_PCI_H */

arch/mips/pci/pci-bcm1480.c

+1 −1
Original line number Diff line number Diff line
@@ -204,7 +204,7 @@ static int __init bcm1480_pcibios_init(void) 
	uint64_t reg;



	/* CFE will assign PCI resources */

	pci_probe_only = 1;

	pci_set_flags(PCI_PROBE_ONLY);



	/* Avoid ISA compat ranges.  */

	PCIBIOS_MIN_IO = 0x00008000UL;

arch/mips/pci/pci-ip27.c

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ int __cpuinit bridge_probe(nasid_t nasid, int widget_id, int masterwid) 
	bridge_t *bridge;

	int slot;



	pci_probe_only = 1;

	pci_set_flags(PCI_PROBE_ONLY);



	printk("a bridge\n");

arch/mips/pci/pci-lantiq.c

+2 −1
Original line number Diff line number Diff line
@@ -270,7 +270,8 @@ static int __devinit ltq_pci_probe(struct platform_device *pdev) 
{

	struct ltq_pci_data *ltq_pci_data =

		(struct ltq_pci_data *) pdev->dev.platform_data;

	pci_probe_only = 0;



	pci_clear_flags(PCI_PROBE_ONLY);

	ltq_pci_irq_map = ltq_pci_data->irq;

	ltq_pci_membase = ioremap_nocache(PCI_CR_BASE_ADDR, PCI_CR_SIZE);

	ltq_pci_mapped_cfg =

arch/mips/pci/pci-sb1250.c

+1 −1
Original line number Diff line number Diff line
@@ -213,7 +213,7 @@ static int __init sb1250_pcibios_init(void) 
	uint64_t reg;



	/* CFE will assign PCI resources */

	pci_probe_only = 1;

	pci_set_flags(PCI_PROBE_ONLY);



	/* Avoid ISA compat ranges.  */

	PCIBIOS_MIN_IO = 0x00008000UL;