[POWERPC] Remove unused pte_offset variable
authorMichael Ellerman <michael@ellerman.id.au>
Fri, 29 Feb 2008 07:33:23 +0000 (18:33 +1100)
committerArnd Bergmann <arnd@arndb.de>
Mon, 3 Mar 2008 07:03:15 +0000 (08:03 +0100)
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>
arch/powerpc/platforms/cell/iommu.c

index 4e75919bf6b952a83dbe1855f8057489ce3824f8..555d264ad5682b1e2331d14df09e3bc21b1d552b 100644 (file)
@@ -123,7 +123,6 @@ struct iommu_window {
        struct cbe_iommu *iommu;
        unsigned long offset;
        unsigned long size;
-       unsigned long pte_offset;
        unsigned int ioid;
        struct iommu_table table;
 };
@@ -475,13 +474,11 @@ cell_iommu_setup_window(struct cbe_iommu *iommu, struct device_node *np,
        window->size = size;
        window->ioid = ioid;
        window->iommu = iommu;
-       window->pte_offset = pte_offset;
 
        window->table.it_blocksize = 16;
        window->table.it_base = (unsigned long)iommu->ptab;
        window->table.it_index = iommu->nid;
-       window->table.it_offset = (offset >> IOMMU_PAGE_SHIFT) +
-               window->pte_offset;
+       window->table.it_offset = (offset >> IOMMU_PAGE_SHIFT) + pte_offset;
        window->table.it_size = size >> IOMMU_PAGE_SHIFT;
 
        iommu_init_table(&window->table, iommu->nid);