[SPARC64]: Kill pci_controller->pbms_same_domain

We don't do the "Simba APB is a PBM" bogosity for Sabre
controllers any longer, so this pbms_same_domain thing
is no longer necessary.

Signed-off-by: David S. Miller <davem@davemloft.net>

4 files changed, 12 insertions, 66 deletions

diff --git a/arch/sparc64/kernel/pci.c b/arch/sparc64/kernel/pci.c
index 6b94d97e56ad..a7809a00324c 100644
--- a/arch/sparc64/kernel/pci.c
+++ b/arch/sparc64/kernel/pci.c
@@ -857,43 +857,12 @@ static int __pci_mmap_make_offset_bus(struct pci_dev *pdev, struct vm_area_struc
         unsigned long space_size, user_offset, user_size;
 
         p = pbm->parent;
-        if (p->pbms_same_domain) {
-                unsigned long lowest, highest;
-
-                lowest = ~0UL; highest = 0UL;
-                if (mmap_state == pci_mmap_io) {
-                        if (p->pbm_A.io_space.flags) {
-                                lowest = p->pbm_A.io_space.start;
-                                highest = p->pbm_A.io_space.end + 1;
-                        }
-                        if (p->pbm_B.io_space.flags) {
-                                if (lowest > p->pbm_B.io_space.start)
-                                        lowest = p->pbm_B.io_space.start;
-                                if (highest < p->pbm_B.io_space.end + 1)
-                                        highest = p->pbm_B.io_space.end + 1;
-                        }
-                        space_size = highest - lowest;
-                } else {
-                        if (p->pbm_A.mem_space.flags) {
-                                lowest = p->pbm_A.mem_space.start;
-                                highest = p->pbm_A.mem_space.end + 1;
-                        }
-                        if (p->pbm_B.mem_space.flags) {
-                                if (lowest > p->pbm_B.mem_space.start)
-                                        lowest = p->pbm_B.mem_space.start;
-                                if (highest < p->pbm_B.mem_space.end + 1)
-                                        highest = p->pbm_B.mem_space.end + 1;
-                        }
-                        space_size = highest - lowest;
-                }
+        if (mmap_state == pci_mmap_io) {
+                space_size = (pbm->io_space.end -
+                              pbm->io_space.start) + 1;
         } else {
-                if (mmap_state == pci_mmap_io) {
-                        space_size = (pbm->io_space.end -
-                                      pbm->io_space.start) + 1;
-                } else {
-                        space_size = (pbm->mem_space.end -
-                                      pbm->mem_space.start) + 1;
-                }
+                space_size = (pbm->mem_space.end -
+                              pbm->mem_space.start) + 1;
         }
 
         /* Make sure the request is in range. */
@@ -904,31 +873,12 @@ static int __pci_mmap_make_offset_bus(struct pci_dev *pdev, struct vm_area_struc
             (user_offset + user_size) > space_size)
                 return -EINVAL;
 
-        if (p->pbms_same_domain) {
-                unsigned long lowest = ~0UL;
-
-                if (mmap_state == pci_mmap_io) {
-                        if (p->pbm_A.io_space.flags)
-                                lowest = p->pbm_A.io_space.start;
-                        if (p->pbm_B.io_space.flags &&
-                            lowest > p->pbm_B.io_space.start)
-                                lowest = p->pbm_B.io_space.start;
-                } else {
-                        if (p->pbm_A.mem_space.flags)
-                                lowest = p->pbm_A.mem_space.start;
-                        if (p->pbm_B.mem_space.flags &&
-                            lowest > p->pbm_B.mem_space.start)
-                                lowest = p->pbm_B.mem_space.start;
-                }
-                vma->vm_pgoff = (lowest + user_offset) >> PAGE_SHIFT;
+        if (mmap_state == pci_mmap_io) {
+                vma->vm_pgoff = (pbm->io_space.start +
+                                 user_offset) >> PAGE_SHIFT;
         } else {
-                if (mmap_state == pci_mmap_io) {
-                        vma->vm_pgoff = (pbm->io_space.start +
-                                         user_offset) >> PAGE_SHIFT;
-                } else {
-                        vma->vm_pgoff = (pbm->mem_space.start +
-                                         user_offset) >> PAGE_SHIFT;
-                }
+                vma->vm_pgoff = (pbm->mem_space.start +
+                                 user_offset) >> PAGE_SHIFT;
         }
 
         return 0;
@@ -1062,9 +1012,8 @@ int pci_domain_nr(struct pci_bus *pbus)
                 struct pci_controller_info *p = pbm->parent;
 
                 ret = p->index;
-                if (p->pbms_same_domain == 0)
-                        ret = ((ret << 1) +
-                               ((pbm == &pbm->parent->pbm_B) ? 1 : 0));
+                ret = ((ret << 1) +
+                       ((pbm == &pbm->parent->pbm_B) ? 1 : 0));
         }
 
         return ret;
diff --git a/arch/sparc64/kernel/pci_psycho.c b/arch/sparc64/kernel/pci_psycho.c
index 64bd3579f1ca..0ab2aa0261ce 100644
--- a/arch/sparc64/kernel/pci_psycho.c
+++ b/arch/sparc64/kernel/pci_psycho.c
@@ -1163,7 +1163,6 @@ void psycho_init(struct device_node *dp, char *model_name)
         p->pbm_A.portid = upa_portid;
         p->pbm_B.portid = upa_portid;
         p->index = pci_num_controllers++;
-        p->pbms_same_domain = 0;
         p->scan_bus = psycho_scan_bus;
         p->pci_ops = &psycho_ops;
 
diff --git a/arch/sparc64/kernel/pci_sabre.c b/arch/sparc64/kernel/pci_sabre.c
index f3ec7bdacdc0..cef81c88548a 100644
--- a/arch/sparc64/kernel/pci_sabre.c
+++ b/arch/sparc64/kernel/pci_sabre.c
@@ -1052,7 +1052,6 @@ void sabre_init(struct device_node *dp, char *model_name)
 
         p->pbm_A.portid = upa_portid;
         p->index = pci_num_controllers++;
-        p->pbms_same_domain = 1;
         p->scan_bus = sabre_scan_bus;
         p->pci_ops = &sabre_ops;
 
diff --git a/arch/sparc64/kernel/pci_sun4v.c b/arch/sparc64/kernel/pci_sun4v.c
index f9cd9f620d4e..b63ef26abf02 100644
--- a/arch/sparc64/kernel/pci_sun4v.c
+++ b/arch/sparc64/kernel/pci_sun4v.c
@@ -1330,7 +1330,6 @@ void sun4v_pci_init(struct device_node *dp, char *model_name)
         pci_controller_root = p;
 
         p->index = pci_num_controllers++;
-        p->pbms_same_domain = 0;
 
         p->scan_bus = pci_sun4v_scan_bus;
 #ifdef CONFIG_PCI_MSI