[SPARC64]: Kill PBM intmap software state.

Set but never used.

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

diff --git a/arch/sparc64/kernel/pci_psycho.c b/arch/sparc64/kernel/pci_psycho.c
index c08681b7a44e6660bc9b16de694d7a89cf079eb4..7b7010a1eb2fe204d124278b241aabc31027d1f9 100644 (file)
--- a/arch/sparc64/kernel/pci_psycho.c
+++ b/arch/sparc64/kernel/pci_psycho.c
@@ -1175,18 +1175,6 @@ static void psycho_pbm_init(struct pci_controller_info *p,
                pbm->num_pbm_ranges = 0;
        }
 
-       prop = of_find_property(dp, "interrupt-map", &len);
-       if (prop) {
-               pbm->pbm_intmap = prop->value;
-               pbm->num_pbm_intmap =
-                       (len / sizeof(struct linux_prom_pci_intmap));
-
-               prop = of_find_property(dp, "interrupt-map-mask", NULL);
-               pbm->pbm_intmask = prop->value;
-       } else {
-               pbm->num_pbm_intmap = 0;
-       }
-
        prop = of_find_property(dp, "bus-range", NULL);
        busrange = prop->value;
        pbm->pci_first_busno = busrange[0];

diff --git a/arch/sparc64/kernel/pci_schizo.c b/arch/sparc64/kernel/pci_schizo.c
index 79ad2688317b1b532261333347efd7ca8dd4e951..81daf903bdf48c9c250c46d45aeae7e4c6948f74 100644 (file)
--- a/arch/sparc64/kernel/pci_schizo.c
+++ b/arch/sparc64/kernel/pci_schizo.c
@@ -1607,14 +1607,6 @@ static void schizo_pbm_init(struct pci_controller_info *p,
 
        pci_determine_mem_io_space(pbm);
 
-       pbm->pbm_intmap = of_get_property(dp, "interrupt-map", &len);
-       if (pbm->pbm_intmap) {
-               pbm->num_pbm_intmap =
-                       (len / sizeof(struct linux_prom_pci_intmap));
-               pbm->pbm_intmask =
-                       of_get_property(dp, "interrupt-map-mask", NULL);
-       }
-
        ino_bitmap = of_get_property(dp, "ino-bitmap", NULL);
        pbm->ino_bitmap = (((u64)ino_bitmap[1] << 32UL) |
                           ((u64)ino_bitmap[0] <<  0UL));

diff --git a/arch/sparc64/kernel/pci_sun4v.c b/arch/sparc64/kernel/pci_sun4v.c
index e1af009617cf5a014bd5751318eb0acbc1c34b36..7bee6b19272ebf8e733518efecf71dd60979c125 100644 (file)
--- a/arch/sparc64/kernel/pci_sun4v.c
+++ b/arch/sparc64/kernel/pci_sun4v.c
@@ -1332,14 +1332,6 @@ static void pci_sun4v_pbm_init(struct pci_controller_info *p, struct device_node
 
        pci_determine_mem_io_space(pbm);
 
-       prop = of_find_property(dp, "interrupt-map", &len);
-       pbm->pbm_intmap = prop->value;
-       pbm->num_pbm_intmap =
-               (len / sizeof(struct linux_prom_pci_intmap));
-
-       prop = of_find_property(dp, "interrupt-map-mask", NULL);
-       pbm->pbm_intmask = prop->value;
-
        pci_sun4v_get_bus_range(pbm);
        pci_sun4v_iommu_init(pbm);
        pci_sun4v_msi_init(pbm);

diff --git a/include/asm-sparc64/pbm.h b/include/asm-sparc64/pbm.h
index 88974d685a3db2ae21309b1558f2f8c86f1b97cc..f31de45f48733fba3b25084ae5b0216553df4834 100644 (file)
--- a/include/asm-sparc64/pbm.h
+++ b/include/asm-sparc64/pbm.h
@@ -162,9 +162,6 @@ struct pci_pbm_info {
        struct device_node              *prom_node;
        struct linux_prom_pci_ranges    *pbm_ranges;
        int                             num_pbm_ranges;
-       struct linux_prom_pci_intmap    *pbm_intmap;
-       int                             num_pbm_intmap;
-       struct linux_prom_pci_intmask   *pbm_intmask;
        u64                             ino_bitmap;
 
        /* PBM I/O and Memory space resources. */