diff options
author | Gavin Shan <shangw@linux.vnet.ibm.com> | 2013-12-25 20:29:40 -0500 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2014-01-14 21:46:45 -0500 |
commit | 8184616f6fcfc98f0ebf083cbf6a43e5efe54e8a (patch) | |
tree | aad18f4ee0dd323c17770c3a93155f7fb0bdd64d | |
parent | 97e7dc523acaa335d44517b06ef5609b3ee65c6a (diff) |
powerpc/powernv: Remove unnecessary assignment
We don't have IO ports on PHB3 and the assignment of variable
"iomap_off" on PHB3 is meaningless. The patch just removes the
unnecessary assignment to the variable. The code change should
have been part of commit c35d2a8c ("powerpc/powernv: Needn't IO
segment map for PHB3").
Signed-off-by: Gavin Shan <shangw@linux.vnet.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
-rw-r--r-- | arch/powerpc/platforms/powernv/pci-ioda.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/powernv/pci-ioda.c b/arch/powerpc/platforms/powernv/pci-ioda.c index f0e68714696e..7d6dcc6d5fa9 100644 --- a/arch/powerpc/platforms/powernv/pci-ioda.c +++ b/arch/powerpc/platforms/powernv/pci-ioda.c | |||
@@ -1144,7 +1144,7 @@ void __init pnv_pci_init_ioda_phb(struct device_node *np, | |||
1144 | { | 1144 | { |
1145 | struct pci_controller *hose; | 1145 | struct pci_controller *hose; |
1146 | struct pnv_phb *phb; | 1146 | struct pnv_phb *phb; |
1147 | unsigned long size, m32map_off, iomap_off, pemap_off; | 1147 | unsigned long size, m32map_off, pemap_off, iomap_off = 0; |
1148 | const __be64 *prop64; | 1148 | const __be64 *prop64; |
1149 | const __be32 *prop32; | 1149 | const __be32 *prop32; |
1150 | int len; | 1150 | int len; |
@@ -1231,7 +1231,6 @@ void __init pnv_pci_init_ioda_phb(struct device_node *np, | |||
1231 | size = _ALIGN_UP(phb->ioda.total_pe / 8, sizeof(unsigned long)); | 1231 | size = _ALIGN_UP(phb->ioda.total_pe / 8, sizeof(unsigned long)); |
1232 | m32map_off = size; | 1232 | m32map_off = size; |
1233 | size += phb->ioda.total_pe * sizeof(phb->ioda.m32_segmap[0]); | 1233 | size += phb->ioda.total_pe * sizeof(phb->ioda.m32_segmap[0]); |
1234 | iomap_off = size; | ||
1235 | if (phb->type == PNV_PHB_IODA1) { | 1234 | if (phb->type == PNV_PHB_IODA1) { |
1236 | iomap_off = size; | 1235 | iomap_off = size; |
1237 | size += phb->ioda.total_pe * sizeof(phb->ioda.io_segmap[0]); | 1236 | size += phb->ioda.total_pe * sizeof(phb->ioda.io_segmap[0]); |