ARM: PCI: get rid of pci_std_swizzle()
authorRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 10 Mar 2012 11:39:33 +0000 (11:39 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 13 May 2012 16:12:16 +0000 (17:12 +0100)
Most PCI implementations use the standard PCI swizzle function, which
handles the well defined behaviour of PCI-to-PCI bridges which can be
found on cards (eg, four port ethernet cards.)

Rather than having almost every platform specify the standard swizzle
function, make this the default when no swizzle function is supplied.
Therefore, a swizzle function only needs to be provided when there is
something exceptional which needs to be handled.

This gets rid of the swizzle initializer from 47 files, and leaves us
with just two platforms specifying a swizzle function: ARM Integrator
and Chalice CATS.

Acked-by: Krzysztof HaƂasa <khc@pm.waw.pl>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
49 files changed:
arch/arm/include/asm/mach/pci.h
arch/arm/kernel/bios32.c
arch/arm/mach-cns3xxx/pcie.c
arch/arm/mach-dove/pcie.c
arch/arm/mach-footbridge/ebsa285-pci.c
arch/arm/mach-footbridge/netwinder-pci.c
arch/arm/mach-iop13xx/iq81340mc.c
arch/arm/mach-iop13xx/iq81340sc.c
arch/arm/mach-iop32x/em7210.c
arch/arm/mach-iop32x/glantank.c
arch/arm/mach-iop32x/iq31244.c
arch/arm/mach-iop32x/iq80321.c
arch/arm/mach-iop32x/n2100.c
arch/arm/mach-iop33x/iq80331.c
arch/arm/mach-iop33x/iq80332.c
arch/arm/mach-ixp4xx/avila-pci.c
arch/arm/mach-ixp4xx/coyote-pci.c
arch/arm/mach-ixp4xx/dsmg600-pci.c
arch/arm/mach-ixp4xx/fsg-pci.c
arch/arm/mach-ixp4xx/gateway7001-pci.c
arch/arm/mach-ixp4xx/goramo_mlr.c
arch/arm/mach-ixp4xx/gtwx5715-pci.c
arch/arm/mach-ixp4xx/ixdp425-pci.c
arch/arm/mach-ixp4xx/ixdpg425-pci.c
arch/arm/mach-ixp4xx/miccpt-pci.c
arch/arm/mach-ixp4xx/nas100d-pci.c
arch/arm/mach-ixp4xx/nslu2-pci.c
arch/arm/mach-ixp4xx/vulcan-pci.c
arch/arm/mach-ixp4xx/wg302v2-pci.c
arch/arm/mach-kirkwood/pcie.c
arch/arm/mach-ks8695/pci.c
arch/arm/mach-mv78xx0/pcie.c
arch/arm/mach-orion5x/db88f5281-setup.c
arch/arm/mach-orion5x/dns323-setup.c
arch/arm/mach-orion5x/kurobox_pro-setup.c
arch/arm/mach-orion5x/mss2-setup.c
arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c
arch/arm/mach-orion5x/rd88f5181l-ge-setup.c
arch/arm/mach-orion5x/rd88f5182-setup.c
arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c
arch/arm/mach-orion5x/terastation_pro2-setup.c
arch/arm/mach-orion5x/ts209-setup.c
arch/arm/mach-orion5x/ts409-setup.c
arch/arm/mach-orion5x/wnr854t-setup.c
arch/arm/mach-orion5x/wrt350n-v2-setup.c
arch/arm/mach-pxa/cm-x2xx-pci.c
arch/arm/mach-shark/pci.c
arch/arm/mach-tegra/pcie.c
arch/arm/mach-versatile/pci.c

index 0fc85480d34bd3323e63940475c59f927a7cb75d..ff8146a696832f60c8bf7eaa51f4a52b0be1fa02 100644 (file)
@@ -48,11 +48,6 @@ struct pci_sys_data {
        void            *private_data;  /* platform controller private 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.
  */
index e17dd2591b26c8f82d859b47d3a89ad266ae71c5..d22e35168e88fc9560b4ad16ba4e634bb0f27185 100644 (file)
@@ -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",
index 79d001f831e056046acb1780d8ba9ccf64830ad4..62f861bef243d1b935903d8c6c0dbd14fe4261ee 100644 (file)
@@ -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,
index 48a032005ea36c04e55c368f8bfe813ab45ec404..cebf6a30a5f199f84b255cb2750628493056464f 100644 (file)
@@ -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,
index 511c673ffa9d7b653373d780cf6e77f368a3b3e0..a5bed6e017d7c4c1242c6763ab5ffb4ac8ab405c 100644 (file)
@@ -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,
index 62187610e17ec0dba84954ea8e39a07b49e9c1be..3f66e894a31edbf8e0341a64e42dfb3881c23d70 100644 (file)
@@ -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,
index 5c96b73e6964c42de4fba7efd00d2c0a932dd827..e3f3e7daa79edc2257580bcabb2a1c4e8b5a6cb7 100644 (file)
@@ -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,
index aa4dd750135abc64e15e6fd0787f54aadf32d3ad..060cddde2fd4ad4f52830f065b275cc3cf704bb5 100644 (file)
@@ -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,
index 24069e03fdc1d632154b3bf489461fbfde5621d2..4915013b3e4fdfbc482606585a02ef2f347d5111 100644 (file)
@@ -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,
index 204e1d1cd7666f679742d8ace9d113c3bce34b11..456a414c892a52f4cbf804fb93a4ea0708325f4a 100644 (file)
@@ -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,
index 3eb642af1cdc261c1a43cb613b987078ed3b3823..b795e6b24fb88b66da35e7c29e3a02d34fff62de 100644 (file)
@@ -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,
index 2ec724b58a2c109545600acb824e68b59563679e..ac6d9625b21663c7eabf0233e3df30f52d14b4c9 100644 (file)
@@ -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,
index 6b6d55912444a4e6498465b87102b39bbb557722..adf257a18f19418c65bfac08ed2ccdb4dc4579f7 100644 (file)
@@ -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,
index abce934f38166069e535b37c921bf7e8c6925dab..3298a8af912676c68177b2e4be5a662178b7d306 100644 (file)
@@ -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,
index 7513559e25bbeed2c40b0ae2735731c164b37661..87b0e9dd74ad548bdae1a78e2ebc9ee822971792 100644 (file)
@@ -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,
index 8fea0a3c5246a531641409ddc6bd14ee78c7a648..89d1f35fff09e68ef4247b19a8fcefbf7d68b635 100644 (file)
@@ -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,
index 71f5c9c60fc3ae97e1eca398c4db064c2b18f7f1..d876a4f13eae38df019e76bcd6e96113ea5dbc05 100644 (file)
@@ -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,
index 0532510b5e8c68c471719b7dd6b04c44070fcd0f..66485979337d82508ed20bd1e6dc1226b41483cd 100644 (file)
@@ -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,
index d2ac803328f7d8db220257edf545c42d5a2328e4..528e4af678c72d3de55b03866fc0bad5f0c300d6 100644 (file)
@@ -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,
index 76581fb467c4feb451cf9cb0b8a938d28f2aac1f..1d1134b347587e5bb780b9a8747a69b84d6b6897 100644 (file)
@@ -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,
index 46bb924962ee41f15e8340513b8e2974a9083216..c97a1a82e0f6692938f428f88fd4ae820ca8023d 100644 (file)
@@ -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,
index d68fc068c38db14403308f3505b04853c2f4e783..4bd8770fee84bf2df8cac751264a0b55221288a5 100644 (file)
@@ -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,
index fffd8c5e40bfa324d40c7b856a4c8e71c2401cf7..3e1a229aee0acc44ae4d573f82475571689de82c 100644 (file)
@@ -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,
index 34efe75015ec97aed368bb9c469473b617387e6a..5c70e9235ceda2605d4546175fb35b3c25897243 100644 (file)
@@ -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,
index ca0bae7fca90d1d97dc399ec00321b668b6ff04d..8d4ba71518d466d703fb90217a7d1ae860926065 100644 (file)
@@ -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,
index 5434ccf553ebc7b7ebd59f514f0fb8b766410b7c..ba1ad203f30fac06e5baeb7121d31810f9ed7310 100644 (file)
@@ -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,
index b57160535e477530e087978bfecfe8b49789729c..ffc060f2fae8dbe4abc2be17be411ba439d4fbe4 100644 (file)
@@ -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,
index 0bc3f34c282ffbd9a20c922926c8cb5dac9a3ff6..b9b1c42b7ef30ebcd2d0361509208bd18c2cf3ae 100644 (file)
@@ -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,
index f27dfcfe811b122dc6f7e971a484d419ee50f5c4..f39a242746b04906a7f9ed5e4ea41b2ec1b04b8c 100644 (file)
@@ -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,
index f56a0118c1bb1f2fc42b09f19917706e6b1182d2..b1034b02867368650f86bd80426ba66350b369d3 100644 (file)
@@ -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,
index acc7014358172dc5987b7aff9c52518b9346f311..f2235e80171edc0e4a1652cd0bd991df0af8badb 100644 (file)
@@ -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,
 };
 
index df3e38055a246380a6e631de74e5aff3d3d887d8..53f2fb5607f9bc6463fa29bb387e018aeb03980f 100644 (file)
@@ -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,
index e52108c9aaea334e589610dd1b51e007230adb80..49a3fd63031358993fe1b0a7fbeba03627b8ad2c 100644 (file)
@@ -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,
index c3ed15b8ea252484619a029d206f63d2170bffc5..8c06ccac44c228adee8371e7161025d90d9ae973 100644 (file)
@@ -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,
index 47587b83284299ae562ba20a5ff422c9668e5b86..1e458efafb9a1cadb882cc8c1b03f460dae1df83 100644 (file)
@@ -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,
index 65faaa34de61382c6f74e2a90f0070f69c2adf58..1c16d045333ea0f5b7551907b36a2eaaed976a5d 100644 (file)
@@ -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,
index 292038fc59fdd70f8b0db81c9f95a2d52cd0e116..78a6a11d82168df2fad570a5898feefec0129a45 100644 (file)
@@ -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,
index c44eabaabc1650d487f0a066a5ac1cdffebd23ab..2f5dc54cd4cd20dc3ad5eb8d747c1457b8494c4f 100644 (file)
@@ -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,
index e3ce61711478d17359c2bad35438a2e5ed31ffd8..399130fac0b611cf50e6948d6990b56cc8297fe8 100644 (file)
@@ -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,
index 2c5fab00d205c9414ba44483b9f896c9864e1509..e91bf0ba4e8ef32323adbebdc14f273b93af1c7f 100644 (file)
@@ -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,
index 632a861ef82bcf9e85336e87fafb27a0f68aba3a..90e571dc4deb4d366ae8314d09baaf8119e5e69b 100644 (file)
@@ -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,
index 5d6408745582b1341845a5b6ccb76f54e11ca8b9..b184f680e0db8e6016f091e15efc21c92a5ab5af 100644 (file)
@@ -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,
index 4e6ff759cd3293df880f5fc1d2f2fbaf422e067c..a5c2e64c4ece06ef1cc6458e54d7df031fdbc1bc 100644 (file)
@@ -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,
index 078c03f7cd52a2d6c13413aae2490aae0377dc09..754c12b6abf09c7e0077b01c3493788b911dc43a 100644 (file)
@@ -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,
index 46a9778171ce8b9da2ee0eafaad67f467d1f21f7..45c21251eb1efa7c5b8ccc456d74ff7411ad5f85 100644 (file)
@@ -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,
index ebd9259f5ac9cd5d3dd9e89525d8b023328b4b90..f83f04a1a46bfa17625bb277fee142ad577c9946 100644 (file)
@@ -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,
index 7cb79a092f316571e68b8352d85bf0b8c42c14b5..f7fa9374e0052e07f1b984c2fb465c6183457b85 100644 (file)
@@ -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,
index 54a816ff3847d9c128d70735a5b875a1a96b1819..0e09137506ec79890b56f76c47ac9e0bc8b225d9 100644 (file)
@@ -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,
 };
 
index 24dd4b1490bde28359d3583019394b4012469a31..80a93ff0d128f0d965afe45195d68e94a1230631 100644 (file)
@@ -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,