5 files changed, 20 insertions, 39 deletions

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 97d07ed60a0b..dcb2e0c55be4 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1279,6 +1279,9 @@ config PCI_DOMAINS
         bool
         depends on PCI
 
+config PCI_DOMAINS_GENERIC
+        def_bool PCI_DOMAINS
+
 config PCI_NANOENGINE
         bool "BSE nanoEngine PCI support"
         depends on SA1100_NANOENGINE
diff --git a/arch/arm/include/asm/mach/pci.h b/arch/arm/include/asm/mach/pci.h
index 8292b5f81e23..28b9bb35949e 100644
--- a/arch/arm/include/asm/mach/pci.h
+++ b/arch/arm/include/asm/mach/pci.h
@@ -19,9 +19,6 @@ struct pci_bus;
 struct device;
 
 struct hw_pci {
-#ifdef CONFIG_PCI_DOMAINS
-        int             domain;
-#endif
 #ifdef CONFIG_PCI_MSI
         struct msi_controller *msi_ctrl;
 #endif
@@ -45,9 +42,6 @@ struct hw_pci {
  * Per-controller structure
  */
 struct pci_sys_data {
-#ifdef CONFIG_PCI_DOMAINS
-        int             domain;
-#endif
 #ifdef CONFIG_PCI_MSI
         struct msi_controller *msi_ctrl;
 #endif
diff --git a/arch/arm/include/asm/pci.h b/arch/arm/include/asm/pci.h
index 7e95d8535e24..585dc33a7a24 100644
--- a/arch/arm/include/asm/pci.h
+++ b/arch/arm/include/asm/pci.h
@@ -18,13 +18,6 @@ static inline int pcibios_assign_all_busses(void)
 }
 
 #ifdef CONFIG_PCI_DOMAINS
-static inline int pci_domain_nr(struct pci_bus *bus)
-{
-        struct pci_sys_data *root = bus->sysdata;
-
-        return root->domain;
-}
-
 static inline int pci_proc_domain(struct pci_bus *bus)
 {
         return pci_domain_nr(bus);
diff --git a/arch/arm/kernel/bios32.c b/arch/arm/kernel/bios32.c
index a4effd6d8f2f..ddd75c58b1e8 100644
--- a/arch/arm/kernel/bios32.c
+++ b/arch/arm/kernel/bios32.c
@@ -463,9 +463,6 @@ static void pcibios_init_hw(struct device *parent, struct hw_pci *hw,
                 if (!sys)
                         panic("PCI: unable to allocate sys data!");
 
-#ifdef CONFIG_PCI_DOMAINS
-                sys->domain  = hw->domain;
-#endif
 #ifdef CONFIG_PCI_MSI
                 sys->msi_ctrl = hw->msi_ctrl;
 #endif
diff --git a/arch/arm/mach-cns3xxx/pcie.c b/arch/arm/mach-cns3xxx/pcie.c
index 45d6bd09e6ef..f6bf9f623d70 100644
--- a/arch/arm/mach-cns3xxx/pcie.c
+++ b/arch/arm/mach-cns3xxx/pcie.c
@@ -30,18 +30,15 @@ struct cns3xxx_pcie {
         unsigned int irqs[2];
         struct resource res_io;
         struct resource res_mem;
-        struct hw_pci hw_pci;
-
+        int port;
         bool linked;
 };
 
-static struct cns3xxx_pcie cns3xxx_pcie[]; /* forward decl. */
-
 static struct cns3xxx_pcie *sysdata_to_cnspci(void *sysdata)
 {
         struct pci_sys_data *root = sysdata;
 
-        return &cns3xxx_pcie[root->domain];
+        return root->private_data;
 }
 
 static struct cns3xxx_pcie *pdev_to_cnspci(const struct pci_dev *dev)
@@ -192,13 +189,7 @@ static struct cns3xxx_pcie cns3xxx_pcie[] = {
                         .flags = IORESOURCE_MEM,
                 },
                 .irqs = { IRQ_CNS3XXX_PCIE0_RC, IRQ_CNS3XXX_PCIE0_DEVICE, },
-                .hw_pci = {
-                        .domain = 0,
-                        .nr_controllers = 1,
-                        .ops = &cns3xxx_pcie_ops,
-                        .setup = cns3xxx_pci_setup,
-                        .map_irq = cns3xxx_pcie_map_irq,
-                },
+                .port = 0,
         },
         [1] = {
                 .host_regs = (void __iomem *)CNS3XXX_PCIE1_HOST_BASE_VIRT,
@@ -217,19 +208,13 @@ static struct cns3xxx_pcie cns3xxx_pcie[] = {
                         .flags = IORESOURCE_MEM,
                 },
                 .irqs = { IRQ_CNS3XXX_PCIE1_RC, IRQ_CNS3XXX_PCIE1_DEVICE, },
-                .hw_pci = {
-                        .domain = 1,
-                        .nr_controllers = 1,
-                        .ops = &cns3xxx_pcie_ops,
-                        .setup = cns3xxx_pci_setup,
-                        .map_irq = cns3xxx_pcie_map_irq,
-                },
+                .port = 1,
         },
 };
 
 static void __init cns3xxx_pcie_check_link(struct cns3xxx_pcie *cnspci)
 {
-        int port = cnspci->hw_pci.domain;
+        int port = cnspci->port;
         u32 reg;
         unsigned long time;
 
@@ -260,9 +245,9 @@ static void __init cns3xxx_pcie_check_link(struct cns3xxx_pcie *cnspci)
 
 static void __init cns3xxx_pcie_hw_init(struct cns3xxx_pcie *cnspci)
 {
-        int port = cnspci->hw_pci.domain;
+        int port = cnspci->port;
         struct pci_sys_data sd = {
-                .domain = port,
+                .private_data = cnspci,
         };
         struct pci_bus bus = {
                 .number = 0,
@@ -323,6 +308,14 @@ static int cns3xxx_pcie_abort_handler(unsigned long addr, unsigned int fsr,
 void __init cns3xxx_pcie_init_late(void)
 {
         int i;
+        void *private_data;
+        struct hw_pci hw_pci = {
+               .nr_controllers = 1,
+               .ops = &cns3xxx_pcie_ops,
+               .setup = cns3xxx_pci_setup,
+               .map_irq = cns3xxx_pcie_map_irq,
+               .private_data = &private_data,
+        };
 
         pcibios_min_io = 0;
         pcibios_min_mem = 0;
@@ -335,7 +328,8 @@ void __init cns3xxx_pcie_init_late(void)
                 cns3xxx_pwr_soft_rst(0x1 << PM_SOFT_RST_REG_OFFST_PCIE(i));
                 cns3xxx_pcie_check_link(&cns3xxx_pcie[i]);
                 cns3xxx_pcie_hw_init(&cns3xxx_pcie[i]);
-                pci_common_init(&cns3xxx_pcie[i].hw_pci);
+                private_data = &cns3xxx_pcie[i];
+                pci_common_init(&hw_pci);
         }
 
         pci_assign_unassigned_resources();