ARM: PCI: provide a default bus scan implementation

Most PCI implementations perform simple root bus scanning.  Rather than
having each group of platforms provide a duplicated bus scan function,
provide the PCI configuration ops structure via the hw_pci structure,
and call the root bus scanning function from core ARM PCI code.

Acked-by: Krzysztof Hałasa <khc@pm.waw.pl>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

5 files changed, 6 insertions, 6 deletions

diff --git a/arch/arm/mach-iop32x/em7210.c b/arch/arm/mach-iop32x/em7210.c
index 4915013b3e4f..9f369f09c29d 100644
--- a/arch/arm/mach-iop32x/em7210.c
+++ b/arch/arm/mach-iop32x/em7210.c
@@ -104,9 +104,9 @@ em7210_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
 
 static struct hw_pci em7210_pci __initdata = {
         .nr_controllers = 1,
+        .ops            = &iop3xx_ops,
         .setup          = iop3xx_pci_setup,
         .preinit        = iop3xx_pci_preinit,
-        .scan           = iop3xx_pci_scan_bus,
         .map_irq        = em7210_pci_map_irq,
 };
 
diff --git a/arch/arm/mach-iop32x/glantank.c b/arch/arm/mach-iop32x/glantank.c
index 456a414c892a..c15a100ba779 100644
--- a/arch/arm/mach-iop32x/glantank.c
+++ b/arch/arm/mach-iop32x/glantank.c
@@ -97,9 +97,9 @@ glantank_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
 
 static struct hw_pci glantank_pci __initdata = {
         .nr_controllers = 1,
+        .ops            = &iop3xx_ops,
         .setup          = iop3xx_pci_setup,
         .preinit        = iop3xx_pci_preinit,
-        .scan           = iop3xx_pci_scan_bus,
         .map_irq        = glantank_pci_map_irq,
 };
 
diff --git a/arch/arm/mach-iop32x/iq31244.c b/arch/arm/mach-iop32x/iq31244.c
index b795e6b24fb8..ddd1c7ecfe57 100644
--- a/arch/arm/mach-iop32x/iq31244.c
+++ b/arch/arm/mach-iop32x/iq31244.c
@@ -131,9 +131,9 @@ ep80219_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
 
 static struct hw_pci ep80219_pci __initdata = {
         .nr_controllers = 1,
+        .ops            = &iop3xx_ops,
         .setup          = iop3xx_pci_setup,
         .preinit        = iop3xx_pci_preinit,
-        .scan           = iop3xx_pci_scan_bus,
         .map_irq        = ep80219_pci_map_irq,
 };
 
@@ -166,9 +166,9 @@ iq31244_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
 
 static struct hw_pci iq31244_pci __initdata = {
         .nr_controllers = 1,
+        .ops            = &iop3xx_ops,
         .setup          = iop3xx_pci_setup,
         .preinit        = iop3xx_pci_preinit,
-        .scan           = iop3xx_pci_scan_bus,
         .map_irq        = iq31244_pci_map_irq,
 };
 
diff --git a/arch/arm/mach-iop32x/iq80321.c b/arch/arm/mach-iop32x/iq80321.c
index ac6d9625b216..bf155e6a3b45 100644
--- a/arch/arm/mach-iop32x/iq80321.c
+++ b/arch/arm/mach-iop32x/iq80321.c
@@ -102,9 +102,9 @@ iq80321_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
 
 static struct hw_pci iq80321_pci __initdata = {
         .nr_controllers = 1,
+        .ops            = &iop3xx_ops,
         .setup          = iop3xx_pci_setup,
         .preinit        = iop3xx_pci_preinit_cond,
-        .scan           = iop3xx_pci_scan_bus,
         .map_irq        = iq80321_pci_map_irq,
 };
 
diff --git a/arch/arm/mach-iop32x/n2100.c b/arch/arm/mach-iop32x/n2100.c
index adf257a18f19..5a7ae91e8849 100644
--- a/arch/arm/mach-iop32x/n2100.c
+++ b/arch/arm/mach-iop32x/n2100.c
@@ -115,9 +115,9 @@ n2100_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
 
 static struct hw_pci n2100_pci __initdata = {
         .nr_controllers = 1,
+        .ops            = &iop3xx_ops,
         .setup          = iop3xx_pci_setup,
         .preinit        = iop3xx_pci_preinit,
-        .scan           = iop3xx_pci_scan_bus,
         .map_irq        = n2100_pci_map_irq,
 };