* [PATCH v2 04/12] arm/PCI: remove arch pci_flags definition [not found] <20120223194209.20708.54480.stgit@bhelgaas.mtv.corp.google.com> @ 2012-02-23 19:43 ` Bjorn Helgaas 2012-02-23 21:39 ` Rob Herring 2012-02-23 19:43 ` [PATCH v2 05/12] arm/PCI: use pci_flags PCI_PROBE_ONLY instead of arm-specific flag Bjorn Helgaas 1 sibling, 1 reply; 3+ messages in thread From: Bjorn Helgaas @ 2012-02-23 19:43 UTC (permalink / raw) To: linux-arm-kernel The PCI core provides a pci_flags definition (currently __weak), so drop the arm definition in favor of that. We EXPORT_SYMBOL(pci_flags) as arm did previously. I'm dubious about this: no other architecture exports it, and I didn't see any modules in the tree that reference it. CC: Rob Herring <rob.herring@calxeda.com> CC: Russell King <linux@arm.linux.org.uk> CC: linux-arm-kernel at lists.infradead.org Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> --- arch/arm/kernel/bios32.c | 2 ++ arch/arm/mm/iomap.c | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/arch/arm/kernel/bios32.c b/arch/arm/kernel/bios32.c index f58ba35..f3fd52b 100644 --- a/arch/arm/kernel/bios32.c +++ b/arch/arm/kernel/bios32.c @@ -525,6 +525,7 @@ void __init pci_common_init(struct hw_pci *hw) INIT_LIST_HEAD(&hw->buses); + pci_add_flags(PCI_REASSIGN_ALL_RSRC); if (hw->preinit) hw->preinit(); pcibios_init_hw(hw); @@ -559,6 +560,7 @@ void __init pci_common_init(struct hw_pci *hw) pci_bus_add_devices(bus); } } +EXPORT_SYMBOL(pci_flags); #ifndef CONFIG_PCI_HOST_ITE8152 void pcibios_set_master(struct pci_dev *dev) diff --git a/arch/arm/mm/iomap.c b/arch/arm/mm/iomap.c index e62956e..4614208 100644 --- a/arch/arm/mm/iomap.c +++ b/arch/arm/mm/iomap.c @@ -32,9 +32,6 @@ EXPORT_SYMBOL(pcibios_min_io); unsigned long pcibios_min_mem = 0x01000000; EXPORT_SYMBOL(pcibios_min_mem); -unsigned int pci_flags = PCI_REASSIGN_ALL_RSRC; -EXPORT_SYMBOL(pci_flags); - void pci_iounmap(struct pci_dev *dev, void __iomem *addr) { if ((unsigned long)addr >= VMALLOC_START && ^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH v2 04/12] arm/PCI: remove arch pci_flags definition 2012-02-23 19:43 ` [PATCH v2 04/12] arm/PCI: remove arch pci_flags definition Bjorn Helgaas @ 2012-02-23 21:39 ` Rob Herring 0 siblings, 0 replies; 3+ messages in thread From: Rob Herring @ 2012-02-23 21:39 UTC (permalink / raw) To: linux-arm-kernel Bjorn, On 02/23/2012 01:43 PM, Bjorn Helgaas wrote: > The PCI core provides a pci_flags definition (currently __weak), so drop > the arm definition in favor of that. > > We EXPORT_SYMBOL(pci_flags) as arm did previously. I'm dubious about > this: no other architecture exports it, and I didn't see any modules in > the tree that reference it. I think you're right that it doesn't need to be exported. Rob > CC: Rob Herring <rob.herring@calxeda.com> > CC: Russell King <linux@arm.linux.org.uk> > CC: linux-arm-kernel at lists.infradead.org > Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> > --- > arch/arm/kernel/bios32.c | 2 ++ > arch/arm/mm/iomap.c | 3 --- > 2 files changed, 2 insertions(+), 3 deletions(-) > > diff --git a/arch/arm/kernel/bios32.c b/arch/arm/kernel/bios32.c > index f58ba35..f3fd52b 100644 > --- a/arch/arm/kernel/bios32.c > +++ b/arch/arm/kernel/bios32.c > @@ -525,6 +525,7 @@ void __init pci_common_init(struct hw_pci *hw) > > INIT_LIST_HEAD(&hw->buses); > > + pci_add_flags(PCI_REASSIGN_ALL_RSRC); > if (hw->preinit) > hw->preinit(); > pcibios_init_hw(hw); > @@ -559,6 +560,7 @@ void __init pci_common_init(struct hw_pci *hw) > pci_bus_add_devices(bus); > } > } > +EXPORT_SYMBOL(pci_flags); > > #ifndef CONFIG_PCI_HOST_ITE8152 > void pcibios_set_master(struct pci_dev *dev) > diff --git a/arch/arm/mm/iomap.c b/arch/arm/mm/iomap.c > index e62956e..4614208 100644 > --- a/arch/arm/mm/iomap.c > +++ b/arch/arm/mm/iomap.c > @@ -32,9 +32,6 @@ EXPORT_SYMBOL(pcibios_min_io); > unsigned long pcibios_min_mem = 0x01000000; > EXPORT_SYMBOL(pcibios_min_mem); > > -unsigned int pci_flags = PCI_REASSIGN_ALL_RSRC; > -EXPORT_SYMBOL(pci_flags); > - > void pci_iounmap(struct pci_dev *dev, void __iomem *addr) > { > if ((unsigned long)addr >= VMALLOC_START && > ^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH v2 05/12] arm/PCI: use pci_flags PCI_PROBE_ONLY instead of arm-specific flag [not found] <20120223194209.20708.54480.stgit@bhelgaas.mtv.corp.google.com> 2012-02-23 19:43 ` [PATCH v2 04/12] arm/PCI: remove arch pci_flags definition Bjorn Helgaas @ 2012-02-23 19:43 ` Bjorn Helgaas 1 sibling, 0 replies; 3+ messages in thread From: Bjorn Helgaas @ 2012-02-23 19:43 UTC (permalink / raw) To: linux-arm-kernel CC: Russell King <linux@arm.linux.org.uk> CC: linux-arm-kernel at lists.infradead.org Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> --- arch/arm/kernel/bios32.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/arch/arm/kernel/bios32.c b/arch/arm/kernel/bios32.c index f3fd52b..8d7c22d 100644 --- a/arch/arm/kernel/bios32.c +++ b/arch/arm/kernel/bios32.c @@ -16,7 +16,6 @@ #include <asm/mach/pci.h> static int debug_pci; -static int use_firmware; /* * We can't use pci_find_device() here since we are @@ -537,7 +536,7 @@ void __init pci_common_init(struct hw_pci *hw) list_for_each_entry(sys, &hw->buses, node) { struct pci_bus *bus = sys->bus; - if (!use_firmware) { + if (!pci_has_flag(PCI_PROBE_ONLY)) { /* * Size the bridge windows. */ @@ -575,7 +574,7 @@ char * __init pcibios_setup(char *str) debug_pci = 1; return NULL; } else if (!strcmp(str, "firmware")) { - use_firmware = 1; + pci_add_flags(PCI_PROBE_ONLY); return NULL; } return str; ^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-02-23 21:39 UTC | newest] Thread overview: 3+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- [not found] <20120223194209.20708.54480.stgit@bhelgaas.mtv.corp.google.com> 2012-02-23 19:43 ` [PATCH v2 04/12] arm/PCI: remove arch pci_flags definition Bjorn Helgaas 2012-02-23 21:39 ` Rob Herring 2012-02-23 19:43 ` [PATCH v2 05/12] arm/PCI: use pci_flags PCI_PROBE_ONLY instead of arm-specific flag Bjorn Helgaas
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).