49 files changed, 16 insertions, 57 deletions

diff --git a/arch/arm/include/asm/mach/pci.h b/arch/arm/include/asm/mach/pci.h
index 0fc85480d34b..ff8146a69683 100644
--- a/arch/arm/include/asm/mach/pci.h
+++ b/arch/arm/include/asm/mach/pci.h
@@ -49,11 +49,6 @@ struct pci_sys_data {
 };
 
 /*
- * This is the standard PCI-PCI bridge swizzling algorithm.
- */
-#define pci_std_swizzle pci_common_swizzle
-
-/*
  * Call this with your hw_pci struct to initialise the PCI system.
  */
 void pci_common_init(struct hw_pci *);
diff --git a/arch/arm/kernel/bios32.c b/arch/arm/kernel/bios32.c
index e17dd2591b26..d22e35168e88 100644
--- a/arch/arm/kernel/bios32.c
+++ b/arch/arm/kernel/bios32.c
@@ -374,16 +374,29 @@ EXPORT_SYMBOL(pcibios_fixup_bus);
 #endif
 
 /*
- * Swizzle the device pin each time we cross a bridge.
- * This might update pin and returns the slot number.
+ * Swizzle the device pin each time we cross a bridge.  If a platform does
+ * not provide a swizzle function, we perform the standard PCI swizzling.
+ *
+ * The default swizzling walks up the bus tree one level at a time, applying
+ * the standard swizzle function at each step, stopping when it finds the PCI
+ * root bus.  This will return the slot number of the bridge device on the
+ * root bus and the interrupt pin on that device which should correspond
+ * with the downstream device interrupt.
+ *
+ * Platforms may override this, in which case the slot and pin returned
+ * depend entirely on the platform code.  However, please note that the
+ * PCI standard swizzle is implemented on plug-in cards and Cardbus based
+ * PCI extenders, so it can not be ignored.
  */
 static u8 __devinit pcibios_swizzle(struct pci_dev *dev, u8 *pin)
 {
         struct pci_sys_data *sys = dev->sysdata;
-        int slot = 0, oldpin = *pin;
+        int slot, oldpin = *pin;
 
         if (sys->swizzle)
                 slot = sys->swizzle(dev, pin);
+        else
+                slot = pci_common_swizzle(dev, pin);
 
         if (debug_pci)
                 printk("PCI: %s swizzling pin %d => pin %d slot %d\n",
diff --git a/arch/arm/mach-cns3xxx/pcie.c b/arch/arm/mach-cns3xxx/pcie.c
index 79d001f831e0..62f861bef243 100644
--- a/arch/arm/mach-cns3xxx/pcie.c
+++ b/arch/arm/mach-cns3xxx/pcie.c
@@ -221,7 +221,6 @@ static struct cns3xxx_pcie cns3xxx_pcie[] = {
                 .irqs = { IRQ_CNS3XXX_PCIE0_RC, IRQ_CNS3XXX_PCIE0_DEVICE, },
                 .hw_pci = {
                         .domain = 0,
-                        .swizzle = pci_std_swizzle,
                         .nr_controllers = 1,
                         .setup = cns3xxx_pci_setup,
                         .scan = cns3xxx_pci_scan_bus,
@@ -264,7 +263,6 @@ static struct cns3xxx_pcie cns3xxx_pcie[] = {
                 .irqs = { IRQ_CNS3XXX_PCIE1_RC, IRQ_CNS3XXX_PCIE1_DEVICE, },
                 .hw_pci = {
                         .domain = 1,
-                        .swizzle = pci_std_swizzle,
                         .nr_controllers = 1,
                         .setup = cns3xxx_pci_setup,
                         .scan = cns3xxx_pci_scan_bus,
diff --git a/arch/arm/mach-dove/pcie.c b/arch/arm/mach-dove/pcie.c
index 48a032005ea3..cebf6a30a5f1 100644
--- a/arch/arm/mach-dove/pcie.c
+++ b/arch/arm/mach-dove/pcie.c
@@ -201,7 +201,6 @@ static int __init dove_pcie_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
 
 static struct hw_pci dove_pci __initdata = {
         .nr_controllers = 2,
-        .swizzle        = pci_std_swizzle,
         .setup          = dove_pcie_setup,
         .scan           = dove_pcie_scan_bus,
         .map_irq        = dove_pcie_map_irq,
diff --git a/arch/arm/mach-footbridge/ebsa285-pci.c b/arch/arm/mach-footbridge/ebsa285-pci.c
index 511c673ffa9d..a5bed6e017d7 100644
--- a/arch/arm/mach-footbridge/ebsa285-pci.c
+++ b/arch/arm/mach-footbridge/ebsa285-pci.c
@@ -29,7 +29,6 @@ static int __init ebsa285_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
 }
 
 static struct hw_pci ebsa285_pci __initdata = {
-        .swizzle                = pci_std_swizzle,
         .map_irq                = ebsa285_map_irq,
         .nr_controllers         = 1,
         .setup                  = dc21285_setup,
diff --git a/arch/arm/mach-footbridge/netwinder-pci.c b/arch/arm/mach-footbridge/netwinder-pci.c
index 62187610e17e..3f66e894a31e 100644
--- a/arch/arm/mach-footbridge/netwinder-pci.c
+++ b/arch/arm/mach-footbridge/netwinder-pci.c
@@ -43,7 +43,6 @@ static int __init netwinder_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
 }
 
 static struct hw_pci netwinder_pci __initdata = {
-        .swizzle                = pci_std_swizzle,
         .map_irq                = netwinder_map_irq,
         .nr_controllers         = 1,
         .setup                  = dc21285_setup,
diff --git a/arch/arm/mach-iop13xx/iq81340mc.c b/arch/arm/mach-iop13xx/iq81340mc.c
index 5c96b73e6964..e3f3e7daa79e 100644
--- a/arch/arm/mach-iop13xx/iq81340mc.c
+++ b/arch/arm/mach-iop13xx/iq81340mc.c
@@ -54,7 +54,6 @@ iq81340mc_pcix_map_irq(const struct pci_dev *dev, u8 idsel, u8 pin)
 }
 
 static struct hw_pci iq81340mc_pci __initdata = {
-        .swizzle        = pci_std_swizzle,
         .nr_controllers = 0,
         .setup          = iop13xx_pci_setup,
         .map_irq        = iq81340mc_pcix_map_irq,
diff --git a/arch/arm/mach-iop13xx/iq81340sc.c b/arch/arm/mach-iop13xx/iq81340sc.c
index aa4dd750135a..060cddde2fd4 100644
--- a/arch/arm/mach-iop13xx/iq81340sc.c
+++ b/arch/arm/mach-iop13xx/iq81340sc.c
@@ -56,7 +56,6 @@ iq81340sc_atux_map_irq(struct pci_dev *dev, u8 idsel, u8 pin)
 }
 
 static struct hw_pci iq81340sc_pci __initdata = {
-        .swizzle        = pci_std_swizzle,
         .nr_controllers = 0,
         .setup          = iop13xx_pci_setup,
         .scan           = iop13xx_scan_bus,
diff --git a/arch/arm/mach-iop32x/em7210.c b/arch/arm/mach-iop32x/em7210.c
index 24069e03fdc1..4915013b3e4f 100644
--- a/arch/arm/mach-iop32x/em7210.c
+++ b/arch/arm/mach-iop32x/em7210.c
@@ -103,7 +103,6 @@ em7210_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
 }
 
 static struct hw_pci em7210_pci __initdata = {
-        .swizzle        = pci_std_swizzle,
         .nr_controllers = 1,
         .setup          = iop3xx_pci_setup,
         .preinit        = iop3xx_pci_preinit,
diff --git a/arch/arm/mach-iop32x/glantank.c b/arch/arm/mach-iop32x/glantank.c
index 204e1d1cd766..456a414c892a 100644
--- a/arch/arm/mach-iop32x/glantank.c
+++ b/arch/arm/mach-iop32x/glantank.c
@@ -96,7 +96,6 @@ glantank_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
 }
 
 static struct hw_pci glantank_pci __initdata = {
-        .swizzle        = pci_std_swizzle,
         .nr_controllers = 1,
         .setup          = iop3xx_pci_setup,
         .preinit        = iop3xx_pci_preinit,
diff --git a/arch/arm/mach-iop32x/iq31244.c b/arch/arm/mach-iop32x/iq31244.c
index 3eb642af1cdc..b795e6b24fb8 100644
--- a/arch/arm/mach-iop32x/iq31244.c
+++ b/arch/arm/mach-iop32x/iq31244.c
@@ -130,7 +130,6 @@ ep80219_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
 }
 
 static struct hw_pci ep80219_pci __initdata = {
-        .swizzle        = pci_std_swizzle,
         .nr_controllers = 1,
         .setup          = iop3xx_pci_setup,
         .preinit        = iop3xx_pci_preinit,
@@ -166,7 +165,6 @@ iq31244_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
 }
 
 static struct hw_pci iq31244_pci __initdata = {
-        .swizzle        = pci_std_swizzle,
         .nr_controllers = 1,
         .setup          = iop3xx_pci_setup,
         .preinit        = iop3xx_pci_preinit,
diff --git a/arch/arm/mach-iop32x/iq80321.c b/arch/arm/mach-iop32x/iq80321.c
index 2ec724b58a2c..ac6d9625b216 100644
--- a/arch/arm/mach-iop32x/iq80321.c
+++ b/arch/arm/mach-iop32x/iq80321.c
@@ -101,7 +101,6 @@ iq80321_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
 }
 
 static struct hw_pci iq80321_pci __initdata = {
-        .swizzle        = pci_std_swizzle,
         .nr_controllers = 1,
         .setup          = iop3xx_pci_setup,
         .preinit        = iop3xx_pci_preinit_cond,
diff --git a/arch/arm/mach-iop32x/n2100.c b/arch/arm/mach-iop32x/n2100.c
index 6b6d55912444..adf257a18f19 100644
--- a/arch/arm/mach-iop32x/n2100.c
+++ b/arch/arm/mach-iop32x/n2100.c
@@ -114,7 +114,6 @@ n2100_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
 }
 
 static struct hw_pci n2100_pci __initdata = {
-        .swizzle        = pci_std_swizzle,
         .nr_controllers = 1,
         .setup          = iop3xx_pci_setup,
         .preinit        = iop3xx_pci_preinit,
diff --git a/arch/arm/mach-iop33x/iq80331.c b/arch/arm/mach-iop33x/iq80331.c
index abce934f3816..3298a8af9126 100644
--- a/arch/arm/mach-iop33x/iq80331.c
+++ b/arch/arm/mach-iop33x/iq80331.c
@@ -84,7 +84,6 @@ iq80331_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
 }
 
 static struct hw_pci iq80331_pci __initdata = {
-        .swizzle        = pci_std_swizzle,
         .nr_controllers = 1,
         .setup          = iop3xx_pci_setup,
         .preinit        = iop3xx_pci_preinit_cond,
diff --git a/arch/arm/mach-iop33x/iq80332.c b/arch/arm/mach-iop33x/iq80332.c
index 7513559e25bb..87b0e9dd74ad 100644
--- a/arch/arm/mach-iop33x/iq80332.c
+++ b/arch/arm/mach-iop33x/iq80332.c
@@ -84,7 +84,6 @@ iq80332_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
 }
 
 static struct hw_pci iq80332_pci __initdata = {
-        .swizzle        = pci_std_swizzle,
         .nr_controllers = 1,
         .setup          = iop3xx_pci_setup,
         .preinit        = iop3xx_pci_preinit_cond,
diff --git a/arch/arm/mach-ixp4xx/avila-pci.c b/arch/arm/mach-ixp4xx/avila-pci.c
index 8fea0a3c5246..89d1f35fff09 100644
--- a/arch/arm/mach-ixp4xx/avila-pci.c
+++ b/arch/arm/mach-ixp4xx/avila-pci.c
@@ -66,7 +66,6 @@ static int __init avila_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
 struct hw_pci avila_pci __initdata = {
         .nr_controllers = 1,
         .preinit        = avila_pci_preinit,
-        .swizzle        = pci_std_swizzle,
         .setup          = ixp4xx_setup,
         .scan           = ixp4xx_scan_bus,
         .map_irq        = avila_map_irq,
diff --git a/arch/arm/mach-ixp4xx/coyote-pci.c b/arch/arm/mach-ixp4xx/coyote-pci.c
index 71f5c9c60fc3..d876a4f13eae 100644
--- a/arch/arm/mach-ixp4xx/coyote-pci.c
+++ b/arch/arm/mach-ixp4xx/coyote-pci.c
@@ -49,7 +49,6 @@ static int __init coyote_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
 struct hw_pci coyote_pci __initdata = {
         .nr_controllers = 1,
         .preinit =        coyote_pci_preinit,
-        .swizzle =        pci_std_swizzle,
         .setup =          ixp4xx_setup,
         .scan =           ixp4xx_scan_bus,
         .map_irq =        coyote_map_irq,
diff --git a/arch/arm/mach-ixp4xx/dsmg600-pci.c b/arch/arm/mach-ixp4xx/dsmg600-pci.c
index 0532510b5e8c..66485979337d 100644
--- a/arch/arm/mach-ixp4xx/dsmg600-pci.c
+++ b/arch/arm/mach-ixp4xx/dsmg600-pci.c
@@ -63,7 +63,6 @@ static int __init dsmg600_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
 struct hw_pci __initdata dsmg600_pci = {
         .nr_controllers = 1,
         .preinit        = dsmg600_pci_preinit,
-        .swizzle        = pci_std_swizzle,
         .setup          = ixp4xx_setup,
         .scan           = ixp4xx_scan_bus,
         .map_irq        = dsmg600_map_irq,
diff --git a/arch/arm/mach-ixp4xx/fsg-pci.c b/arch/arm/mach-ixp4xx/fsg-pci.c
index d2ac803328f7..528e4af678c7 100644
--- a/arch/arm/mach-ixp4xx/fsg-pci.c
+++ b/arch/arm/mach-ixp4xx/fsg-pci.c
@@ -60,7 +60,6 @@ static int __init fsg_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
 struct hw_pci fsg_pci __initdata = {
         .nr_controllers = 1,
         .preinit =        fsg_pci_preinit,
-        .swizzle =        pci_std_swizzle,
         .setup =          ixp4xx_setup,
         .scan =           ixp4xx_scan_bus,
         .map_irq =        fsg_map_irq,
diff --git a/arch/arm/mach-ixp4xx/gateway7001-pci.c b/arch/arm/mach-ixp4xx/gateway7001-pci.c
index 76581fb467c4..1d1134b34758 100644
--- a/arch/arm/mach-ixp4xx/gateway7001-pci.c
+++ b/arch/arm/mach-ixp4xx/gateway7001-pci.c
@@ -48,7 +48,6 @@ static int __init gateway7001_map_irq(const struct pci_dev *dev, u8 slot,
 struct hw_pci gateway7001_pci __initdata = {
         .nr_controllers = 1,
         .preinit =        gateway7001_pci_preinit,
-        .swizzle =        pci_std_swizzle,
         .setup =          ixp4xx_setup,
         .scan =           ixp4xx_scan_bus,
         .map_irq =        gateway7001_map_irq,
diff --git a/arch/arm/mach-ixp4xx/goramo_mlr.c b/arch/arm/mach-ixp4xx/goramo_mlr.c
index 46bb924962ee..c97a1a82e0f6 100644
--- a/arch/arm/mach-ixp4xx/goramo_mlr.c
+++ b/arch/arm/mach-ixp4xx/goramo_mlr.c
@@ -475,7 +475,6 @@ static struct hw_pci gmlr_hw_pci __initdata = {
         .nr_controllers = 1,
         .preinit        = gmlr_pci_preinit,
         .postinit       = gmlr_pci_postinit,
-        .swizzle        = pci_std_swizzle,
         .setup          = ixp4xx_setup,
         .scan           = ixp4xx_scan_bus,
         .map_irq        = gmlr_map_irq,
diff --git a/arch/arm/mach-ixp4xx/gtwx5715-pci.c b/arch/arm/mach-ixp4xx/gtwx5715-pci.c
index d68fc068c38d..4bd8770fee84 100644
--- a/arch/arm/mach-ixp4xx/gtwx5715-pci.c
+++ b/arch/arm/mach-ixp4xx/gtwx5715-pci.c
@@ -68,7 +68,6 @@ static int __init gtwx5715_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
 struct hw_pci gtwx5715_pci __initdata = {
         .nr_controllers = 1,
         .preinit =        gtwx5715_pci_preinit,
-        .swizzle =        pci_std_swizzle,
         .setup =          ixp4xx_setup,
         .scan =           ixp4xx_scan_bus,
         .map_irq =        gtwx5715_map_irq,
diff --git a/arch/arm/mach-ixp4xx/ixdp425-pci.c b/arch/arm/mach-ixp4xx/ixdp425-pci.c
index fffd8c5e40bf..3e1a229aee0a 100644
--- a/arch/arm/mach-ixp4xx/ixdp425-pci.c
+++ b/arch/arm/mach-ixp4xx/ixdp425-pci.c
@@ -61,7 +61,6 @@ static int __init ixdp425_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
 struct hw_pci ixdp425_pci __initdata = {
         .nr_controllers = 1,
         .preinit        = ixdp425_pci_preinit,
-        .swizzle        = pci_std_swizzle,
         .setup          = ixp4xx_setup,
         .scan           = ixp4xx_scan_bus,
         .map_irq        = ixdp425_map_irq,
diff --git a/arch/arm/mach-ixp4xx/ixdpg425-pci.c b/arch/arm/mach-ixp4xx/ixdpg425-pci.c
index 34efe75015ec..5c70e9235ced 100644
--- a/arch/arm/mach-ixp4xx/ixdpg425-pci.c
+++ b/arch/arm/mach-ixp4xx/ixdpg425-pci.c
@@ -43,7 +43,6 @@ static int __init ixdpg425_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
 struct hw_pci ixdpg425_pci __initdata = {
         .nr_controllers = 1,
         .preinit =        ixdpg425_pci_preinit,
-        .swizzle =        pci_std_swizzle,
         .setup =          ixp4xx_setup,
         .scan =           ixp4xx_scan_bus,
         .map_irq =        ixdpg425_map_irq,
diff --git a/arch/arm/mach-ixp4xx/miccpt-pci.c b/arch/arm/mach-ixp4xx/miccpt-pci.c
index ca0bae7fca90..8d4ba71518d4 100644
--- a/arch/arm/mach-ixp4xx/miccpt-pci.c
+++ b/arch/arm/mach-ixp4xx/miccpt-pci.c
@@ -62,7 +62,6 @@ static int __init miccpt_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
 struct hw_pci miccpt_pci __initdata = {
         .nr_controllers = 1,
         .preinit        = miccpt_pci_preinit,
-        .swizzle        = pci_std_swizzle,
         .setup          = ixp4xx_setup,
         .scan           = ixp4xx_scan_bus,
         .map_irq        = miccpt_map_irq,
diff --git a/arch/arm/mach-ixp4xx/nas100d-pci.c b/arch/arm/mach-ixp4xx/nas100d-pci.c
index 5434ccf553eb..ba1ad203f30f 100644
--- a/arch/arm/mach-ixp4xx/nas100d-pci.c
+++ b/arch/arm/mach-ixp4xx/nas100d-pci.c
@@ -59,7 +59,6 @@ static int __init nas100d_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
 struct hw_pci __initdata nas100d_pci = {
         .nr_controllers = 1,
         .preinit        = nas100d_pci_preinit,
-        .swizzle        = pci_std_swizzle,
         .setup          = ixp4xx_setup,
         .scan           = ixp4xx_scan_bus,
         .map_irq        = nas100d_map_irq,
diff --git a/arch/arm/mach-ixp4xx/nslu2-pci.c b/arch/arm/mach-ixp4xx/nslu2-pci.c
index b57160535e47..ffc060f2fae8 100644
--- a/arch/arm/mach-ixp4xx/nslu2-pci.c
+++ b/arch/arm/mach-ixp4xx/nslu2-pci.c
@@ -55,7 +55,6 @@ static int __init nslu2_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
 struct hw_pci __initdata nslu2_pci = {
         .nr_controllers = 1,
         .preinit        = nslu2_pci_preinit,
-        .swizzle        = pci_std_swizzle,
         .setup          = ixp4xx_setup,
         .scan           = ixp4xx_scan_bus,
         .map_irq        = nslu2_map_irq,
diff --git a/arch/arm/mach-ixp4xx/vulcan-pci.c b/arch/arm/mach-ixp4xx/vulcan-pci.c
index 0bc3f34c282f..b9b1c42b7ef3 100644
--- a/arch/arm/mach-ixp4xx/vulcan-pci.c
+++ b/arch/arm/mach-ixp4xx/vulcan-pci.c
@@ -57,7 +57,6 @@ static int __init vulcan_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
 struct hw_pci vulcan_pci __initdata = {
         .nr_controllers = 1,
         .preinit        = vulcan_pci_preinit,
-        .swizzle        = pci_std_swizzle,
         .setup          = ixp4xx_setup,
         .scan           = ixp4xx_scan_bus,
         .map_irq        = vulcan_map_irq,
diff --git a/arch/arm/mach-ixp4xx/wg302v2-pci.c b/arch/arm/mach-ixp4xx/wg302v2-pci.c
index f27dfcfe811b..f39a242746b0 100644
--- a/arch/arm/mach-ixp4xx/wg302v2-pci.c
+++ b/arch/arm/mach-ixp4xx/wg302v2-pci.c
@@ -47,7 +47,6 @@ static int __init wg302v2_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
 struct hw_pci wg302v2_pci __initdata = {
         .nr_controllers = 1,
         .preinit =        wg302v2_pci_preinit,
-        .swizzle =        pci_std_swizzle,
         .setup =          ixp4xx_setup,
         .scan =           ixp4xx_scan_bus,
         .map_irq =        wg302v2_map_irq,
diff --git a/arch/arm/mach-kirkwood/pcie.c b/arch/arm/mach-kirkwood/pcie.c
index f56a0118c1bb..b1034b028673 100644
--- a/arch/arm/mach-kirkwood/pcie.c
+++ b/arch/arm/mach-kirkwood/pcie.c
@@ -254,7 +254,6 @@ static int __init kirkwood_pcie_map_irq(const struct pci_dev *dev, u8 slot,
 }
 
 static struct hw_pci kirkwood_pci __initdata = {
-        .swizzle        = pci_std_swizzle,
         .setup          = kirkwood_pcie_setup,
         .scan           = kirkwood_pcie_scan_bus,
         .map_irq        = kirkwood_pcie_map_irq,
diff --git a/arch/arm/mach-ks8695/pci.c b/arch/arm/mach-ks8695/pci.c
index acc701435817..f2235e80171e 100644
--- a/arch/arm/mach-ks8695/pci.c
+++ b/arch/arm/mach-ks8695/pci.c
@@ -306,7 +306,6 @@ static struct hw_pci ks8695_pci __initdata = {
         .setup          = ks8695_pci_setup,
         .scan           = ks8695_pci_scan_bus,
         .postinit       = NULL,
-        .swizzle        = pci_std_swizzle,
         .map_irq        = NULL,
 };
 
diff --git a/arch/arm/mach-mv78xx0/pcie.c b/arch/arm/mach-mv78xx0/pcie.c
index df3e38055a24..53f2fb5607f9 100644
--- a/arch/arm/mach-mv78xx0/pcie.c
+++ b/arch/arm/mach-mv78xx0/pcie.c
@@ -271,7 +271,6 @@ static int __init mv78xx0_pcie_map_irq(const struct pci_dev *dev, u8 slot,
 static struct hw_pci mv78xx0_pci __initdata = {
         .nr_controllers = 8,
         .preinit        = mv78xx0_pcie_preinit,
-        .swizzle        = pci_std_swizzle,
         .setup          = mv78xx0_pcie_setup,
         .scan           = mv78xx0_pcie_scan_bus,
         .map_irq        = mv78xx0_pcie_map_irq,
diff --git a/arch/arm/mach-orion5x/db88f5281-setup.c b/arch/arm/mach-orion5x/db88f5281-setup.c
index e52108c9aaea..49a3fd630313 100644
--- a/arch/arm/mach-orion5x/db88f5281-setup.c
+++ b/arch/arm/mach-orion5x/db88f5281-setup.c
@@ -265,7 +265,6 @@ static int __init db88f5281_pci_map_irq(const struct pci_dev *dev, u8 slot,
 static struct hw_pci db88f5281_pci __initdata = {
         .nr_controllers = 2,
         .preinit        = db88f5281_pci_preinit,
-        .swizzle        = pci_std_swizzle,
         .setup          = orion5x_pci_sys_setup,
         .scan           = orion5x_pci_sys_scan_bus,
         .map_irq        = db88f5281_pci_map_irq,
diff --git a/arch/arm/mach-orion5x/dns323-setup.c b/arch/arm/mach-orion5x/dns323-setup.c
index c3ed15b8ea25..8c06ccac44c2 100644
--- a/arch/arm/mach-orion5x/dns323-setup.c
+++ b/arch/arm/mach-orion5x/dns323-setup.c
@@ -86,7 +86,6 @@ static int __init dns323_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
 
 static struct hw_pci dns323_pci __initdata = {
         .nr_controllers = 2,
-        .swizzle        = pci_std_swizzle,
         .setup          = orion5x_pci_sys_setup,
         .scan           = orion5x_pci_sys_scan_bus,
         .map_irq        = dns323_pci_map_irq,
diff --git a/arch/arm/mach-orion5x/kurobox_pro-setup.c b/arch/arm/mach-orion5x/kurobox_pro-setup.c
index 47587b832842..1e458efafb9a 100644
--- a/arch/arm/mach-orion5x/kurobox_pro-setup.c
+++ b/arch/arm/mach-orion5x/kurobox_pro-setup.c
@@ -138,7 +138,6 @@ static int __init kurobox_pro_pci_map_irq(const struct pci_dev *dev, u8 slot,
 
 static struct hw_pci kurobox_pro_pci __initdata = {
         .nr_controllers = 2,
-        .swizzle        = pci_std_swizzle,
         .setup          = orion5x_pci_sys_setup,
         .scan           = orion5x_pci_sys_scan_bus,
         .map_irq        = kurobox_pro_pci_map_irq,
diff --git a/arch/arm/mach-orion5x/mss2-setup.c b/arch/arm/mach-orion5x/mss2-setup.c
index 65faaa34de61..1c16d045333e 100644
--- a/arch/arm/mach-orion5x/mss2-setup.c
+++ b/arch/arm/mach-orion5x/mss2-setup.c
@@ -89,7 +89,6 @@ static int __init mss2_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
 
 static struct hw_pci mss2_pci __initdata = {
         .nr_controllers = 2,
-        .swizzle        = pci_std_swizzle,
         .setup          = orion5x_pci_sys_setup,
         .scan           = orion5x_pci_sys_scan_bus,
         .map_irq        = mss2_pci_map_irq,
diff --git a/arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c b/arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c
index 292038fc59fd..78a6a11d8216 100644
--- a/arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c
+++ b/arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c
@@ -149,7 +149,6 @@ rd88f5181l_fxo_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
 
 static struct hw_pci rd88f5181l_fxo_pci __initdata = {
         .nr_controllers = 2,
-        .swizzle        = pci_std_swizzle,
         .setup          = orion5x_pci_sys_setup,
         .scan           = orion5x_pci_sys_scan_bus,
         .map_irq        = rd88f5181l_fxo_pci_map_irq,
diff --git a/arch/arm/mach-orion5x/rd88f5181l-ge-setup.c b/arch/arm/mach-orion5x/rd88f5181l-ge-setup.c
index c44eabaabc16..2f5dc54cd4cd 100644
--- a/arch/arm/mach-orion5x/rd88f5181l-ge-setup.c
+++ b/arch/arm/mach-orion5x/rd88f5181l-ge-setup.c
@@ -161,7 +161,6 @@ rd88f5181l_ge_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
 
 static struct hw_pci rd88f5181l_ge_pci __initdata = {
         .nr_controllers = 2,
-        .swizzle        = pci_std_swizzle,
         .setup          = orion5x_pci_sys_setup,
         .scan           = orion5x_pci_sys_scan_bus,
         .map_irq        = rd88f5181l_ge_pci_map_irq,
diff --git a/arch/arm/mach-orion5x/rd88f5182-setup.c b/arch/arm/mach-orion5x/rd88f5182-setup.c
index e3ce61711478..399130fac0b6 100644
--- a/arch/arm/mach-orion5x/rd88f5182-setup.c
+++ b/arch/arm/mach-orion5x/rd88f5182-setup.c
@@ -200,7 +200,6 @@ static int __init rd88f5182_pci_map_irq(const struct pci_dev *dev, u8 slot,
 static struct hw_pci rd88f5182_pci __initdata = {
         .nr_controllers = 2,
         .preinit        = rd88f5182_pci_preinit,
-        .swizzle        = pci_std_swizzle,
         .setup          = orion5x_pci_sys_setup,
         .scan           = orion5x_pci_sys_scan_bus,
         .map_irq        = rd88f5182_pci_map_irq,
diff --git a/arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c b/arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c
index 2c5fab00d205..e91bf0ba4e8e 100644
--- a/arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c
+++ b/arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c
@@ -102,7 +102,6 @@ static void __init rd88f6183ap_ge_init(void)
 
 static struct hw_pci rd88f6183ap_ge_pci __initdata = {
         .nr_controllers = 2,
-        .swizzle        = pci_std_swizzle,
         .setup          = orion5x_pci_sys_setup,
         .scan           = orion5x_pci_sys_scan_bus,
         .map_irq        = orion5x_pci_map_irq,
diff --git a/arch/arm/mach-orion5x/terastation_pro2-setup.c b/arch/arm/mach-orion5x/terastation_pro2-setup.c
index 632a861ef82b..90e571dc4deb 100644
--- a/arch/arm/mach-orion5x/terastation_pro2-setup.c
+++ b/arch/arm/mach-orion5x/terastation_pro2-setup.c
@@ -122,7 +122,6 @@ static int __init tsp2_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
 static struct hw_pci tsp2_pci __initdata = {
         .nr_controllers = 2,
         .preinit        = tsp2_pci_preinit,
-        .swizzle        = pci_std_swizzle,
         .setup          = orion5x_pci_sys_setup,
         .scan           = orion5x_pci_sys_scan_bus,
         .map_irq        = tsp2_pci_map_irq,
diff --git a/arch/arm/mach-orion5x/ts209-setup.c b/arch/arm/mach-orion5x/ts209-setup.c
index 5d6408745582..b184f680e0db 100644
--- a/arch/arm/mach-orion5x/ts209-setup.c
+++ b/arch/arm/mach-orion5x/ts209-setup.c
@@ -170,7 +170,6 @@ static int __init qnap_ts209_pci_map_irq(const struct pci_dev *dev, u8 slot,
 static struct hw_pci qnap_ts209_pci __initdata = {
         .nr_controllers = 2,
         .preinit        = qnap_ts209_pci_preinit,
-        .swizzle        = pci_std_swizzle,
         .setup          = orion5x_pci_sys_setup,
         .scan           = orion5x_pci_sys_scan_bus,
         .map_irq        = qnap_ts209_pci_map_irq,
diff --git a/arch/arm/mach-orion5x/ts409-setup.c b/arch/arm/mach-orion5x/ts409-setup.c
index 4e6ff759cd32..a5c2e64c4ece 100644
--- a/arch/arm/mach-orion5x/ts409-setup.c
+++ b/arch/arm/mach-orion5x/ts409-setup.c
@@ -140,7 +140,6 @@ static int __init qnap_ts409_pci_map_irq(const struct pci_dev *dev, u8 slot,
 
 static struct hw_pci qnap_ts409_pci __initdata = {
         .nr_controllers = 2,
-        .swizzle        = pci_std_swizzle,
         .setup          = orion5x_pci_sys_setup,
         .scan           = orion5x_pci_sys_scan_bus,
         .map_irq        = qnap_ts409_pci_map_irq,
diff --git a/arch/arm/mach-orion5x/wnr854t-setup.c b/arch/arm/mach-orion5x/wnr854t-setup.c
index 078c03f7cd52..754c12b6abf0 100644
--- a/arch/arm/mach-orion5x/wnr854t-setup.c
+++ b/arch/arm/mach-orion5x/wnr854t-setup.c
@@ -155,7 +155,6 @@ static int __init wnr854t_pci_map_irq(const struct pci_dev *dev, u8 slot,
 
 static struct hw_pci wnr854t_pci __initdata = {
         .nr_controllers = 2,
-        .swizzle        = pci_std_swizzle,
         .setup          = orion5x_pci_sys_setup,
         .scan           = orion5x_pci_sys_scan_bus,
         .map_irq        = wnr854t_pci_map_irq,
diff --git a/arch/arm/mach-orion5x/wrt350n-v2-setup.c b/arch/arm/mach-orion5x/wrt350n-v2-setup.c
index 46a9778171ce..45c21251eb1e 100644
--- a/arch/arm/mach-orion5x/wrt350n-v2-setup.c
+++ b/arch/arm/mach-orion5x/wrt350n-v2-setup.c
@@ -243,7 +243,6 @@ static int __init wrt350n_v2_pci_map_irq(const struct pci_dev *dev, u8 slot,
 
 static struct hw_pci wrt350n_v2_pci __initdata = {
         .nr_controllers = 2,
-        .swizzle        = pci_std_swizzle,
         .setup          = orion5x_pci_sys_setup,
         .scan           = orion5x_pci_sys_scan_bus,
         .map_irq        = wrt350n_v2_pci_map_irq,
diff --git a/arch/arm/mach-pxa/cm-x2xx-pci.c b/arch/arm/mach-pxa/cm-x2xx-pci.c
index ebd9259f5ac9..f83f04a1a46b 100644
--- a/arch/arm/mach-pxa/cm-x2xx-pci.c
+++ b/arch/arm/mach-pxa/cm-x2xx-pci.c
@@ -181,7 +181,6 @@ static void cmx2xx_pci_preinit(void)
 }
 
 static struct hw_pci cmx2xx_pci __initdata = {
-        .swizzle        = pci_std_swizzle,
         .map_irq        = cmx2xx_pci_map_irq,
         .nr_controllers = 1,
         .setup          = it8152_pci_setup,
diff --git a/arch/arm/mach-shark/pci.c b/arch/arm/mach-shark/pci.c
index 7cb79a092f31..f7fa9374e005 100644
--- a/arch/arm/mach-shark/pci.c
+++ b/arch/arm/mach-shark/pci.c
@@ -29,7 +29,6 @@ extern void __init via82c505_preinit(void);
 
 static struct hw_pci shark_pci __initdata = {
         .setup          = via82c505_setup,
-        .swizzle        = pci_std_swizzle,
         .map_irq        = shark_map_irq,
         .nr_controllers = 1,
         .scan           = via82c505_scan_bus,
diff --git a/arch/arm/mach-tegra/pcie.c b/arch/arm/mach-tegra/pcie.c
index 54a816ff3847..0e09137506ec 100644
--- a/arch/arm/mach-tegra/pcie.c
+++ b/arch/arm/mach-tegra/pcie.c
@@ -475,7 +475,6 @@ static struct hw_pci tegra_pcie_hw __initdata = {
         .nr_controllers = 2,
         .setup          = tegra_pcie_setup,
         .scan           = tegra_pcie_scan_bus,
-        .swizzle        = pci_std_swizzle,
         .map_irq        = tegra_pcie_map_irq,
 };
 
diff --git a/arch/arm/mach-versatile/pci.c b/arch/arm/mach-versatile/pci.c
index 24dd4b1490bd..80a93ff0d128 100644
--- a/arch/arm/mach-versatile/pci.c
+++ b/arch/arm/mach-versatile/pci.c
@@ -345,7 +345,6 @@ static int __init versatile_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
 }
 
 static struct hw_pci versatile_pci __initdata = {
-        .swizzle                = pci_std_swizzle,
         .map_irq                = versatile_map_irq,
         .nr_controllers         = 1,
         .setup                  = pci_versatile_setup,