Commit 08e02427 authored by Michael Ellerman's avatar Michael Ellerman Committed by Arnd Bergmann

[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: default avatarMichael Ellerman <michael@ellerman.id.au>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 0d7386eb
...@@ -123,7 +123,6 @@ struct iommu_window { ...@@ -123,7 +123,6 @@ struct iommu_window {
struct cbe_iommu *iommu; struct cbe_iommu *iommu;
unsigned long offset; unsigned long offset;
unsigned long size; unsigned long size;
unsigned long pte_offset;
unsigned int ioid; unsigned int ioid;
struct iommu_table table; struct iommu_table table;
}; };
...@@ -475,13 +474,11 @@ cell_iommu_setup_window(struct cbe_iommu *iommu, struct device_node *np, ...@@ -475,13 +474,11 @@ cell_iommu_setup_window(struct cbe_iommu *iommu, struct device_node *np,
window->size = size; window->size = size;
window->ioid = ioid; window->ioid = ioid;
window->iommu = iommu; window->iommu = iommu;
window->pte_offset = pte_offset;
window->table.it_blocksize = 16; window->table.it_blocksize = 16;
window->table.it_base = (unsigned long)iommu->ptab; window->table.it_base = (unsigned long)iommu->ptab;
window->table.it_index = iommu->nid; window->table.it_index = iommu->nid;
window->table.it_offset = (offset >> IOMMU_PAGE_SHIFT) + window->table.it_offset = (offset >> IOMMU_PAGE_SHIFT) + pte_offset;
window->pte_offset;
window->table.it_size = size >> IOMMU_PAGE_SHIFT; window->table.it_size = size >> IOMMU_PAGE_SHIFT;
iommu_init_table(&window->table, iommu->nid); iommu_init_table(&window->table, iommu->nid);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment