summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorNishanth Aravamudan <nacc@us.ibm.com>2010-10-26 17:35:15 +0000
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2010-12-09 15:17:50 +1100
commit4af2da25ede8af6536254e92b6ed5c4026105870 (patch)
tree6efc431b2a3cc64dd7d53e077a314d4a68d6892e /arch
parentf4133236d6473072b5982c1182991eade6ff5bae (diff)
downloadlinux-stable-4af2da25ede8af6536254e92b6ed5c4026105870.tar.gz
linux-stable-4af2da25ede8af6536254e92b6ed5c4026105870.tar.bz2
linux-stable-4af2da25ede8af6536254e92b6ed5c4026105870.zip
powerpc/pseries: Do not need to check for dma_window == NULL
The block in pci_dma_dev_setup_pSeriesLP for dma_window == NULL can be removed because we will only teminate the loop if we had already allocated a iommu table for that node or we found a window. While there may be no window for the device, the intresting part is if we are reusing a table or creating it for the first device under it. Signed-off-by: Milton Miller <miltonm@bga.com> Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/platforms/pseries/iommu.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/powerpc/platforms/pseries/iommu.c b/arch/powerpc/platforms/pseries/iommu.c
index dae3f8847117..0c1958ac1011 100644
--- a/arch/powerpc/platforms/pseries/iommu.c
+++ b/arch/powerpc/platforms/pseries/iommu.c
@@ -530,12 +530,6 @@ static void pci_dma_dev_setup_pSeriesLP(struct pci_dev *dev)
}
pr_debug(" parent is %s\n", pdn->full_name);
- if (dma_window == NULL) {
- pr_debug(" no dma window for device, linking to parent\n");
- set_iommu_table_base(&dev->dev, PCI_DN(pdn)->iommu_table);
- return;
- }
-
pci = PCI_DN(pdn);
if (!pci->iommu_table) {
tbl = kzalloc_node(sizeof(struct iommu_table), GFP_KERNEL,