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

Commit 6696cbc3 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

arm/PCI: remove arch pci_flags definition 



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@lists.infradead.org
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent 151d16d5

arch/arm/kernel/bios32.c

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

arch/arm/mm/iomap.c

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