aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Ellerman <michael@ellerman.id.au>2008-02-29 02:33:23 -0500
committerArnd Bergmann <arnd@arndb.de>2008-03-03 02:03:15 -0500
commit08e024272e529076663e5b4dc8eeecd4131f8a48 (patch)
tree09057fbb85ea07ad9a2c9598c9e50b37ef8f1235
parent0d7386ebffd8506b28c37a7d5541132a576f64e2 (diff)
[POWERPC] Remove unused pte_offset variable
The cell IOMMU code no longer needs to save the pte_offset variable separately, it is incorporated into tbl->it_offset. Signed-off-by: Michael Ellerman <michael@ellerman.id.au> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-rw-r--r--arch/powerpc/platforms/cell/iommu.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/powerpc/platforms/cell/iommu.c b/arch/powerpc/platforms/cell/iommu.c
index 4e75919bf6b9..555d264ad568 100644
--- a/arch/powerpc/platforms/cell/iommu.c
+++ b/arch/powerpc/platforms/cell/iommu.c
@@ -123,7 +123,6 @@ struct iommu_window {
123 struct cbe_iommu *iommu; 123 struct cbe_iommu *iommu;
124 unsigned long offset; 124 unsigned long offset;
125 unsigned long size; 125 unsigned long size;
126 unsigned long pte_offset;
127 unsigned int ioid; 126 unsigned int ioid;
128 struct iommu_table table; 127 struct iommu_table table;
129}; 128};
@@ -475,13 +474,11 @@ cell_iommu_setup_window(struct cbe_iommu *iommu, struct device_node *np,
475 window->size = size; 474 window->size = size;
476 window->ioid = ioid; 475 window->ioid = ioid;
477 window->iommu = iommu; 476 window->iommu = iommu;
478 window->pte_offset = pte_offset;
479 477
480 window->table.it_blocksize = 16; 478 window->table.it_blocksize = 16;
481 window->table.it_base = (unsigned long)iommu->ptab; 479 window->table.it_base = (unsigned long)iommu->ptab;
482 window->table.it_index = iommu->nid; 480 window->table.it_index = iommu->nid;
483 window->table.it_offset = (offset >> IOMMU_PAGE_SHIFT) + 481 window->table.it_offset = (offset >> IOMMU_PAGE_SHIFT) + pte_offset;
484 window->pte_offset;
485 window->table.it_size = size >> IOMMU_PAGE_SHIFT; 482 window->table.it_size = size >> IOMMU_PAGE_SHIFT;
486 483
487 iommu_init_table(&window->table, iommu->nid); 484 iommu_init_table(&window->table, iommu->nid);