aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc
diff options
context:
space:
mode:
authorNishanth Aravamudan <nacc@us.ibm.com>2010-10-26 13:35:14 -0400
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2010-12-08 23:17:50 -0500
commitf4133236d6473072b5982c1182991eade6ff5bae (patch)
treefda913b77f0a4567c122d1721d63a1232088f53a /arch/powerpc
parent7372cfb88f71ed975c8588d1ca5ecc8bb9ec7c7b (diff)
powerpc/pseries: Checking for pdn->parent is redundant
The device tree root is never a pci bus, and will not have a PCI_DN(pdn), so the check for PCI_DN added in 650f7b3b2f0ead0673e90452cf3dedde97c537ba makes the check for pdn->parent redundant and it can be removed. 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/powerpc')
-rw-r--r--arch/powerpc/platforms/pseries/iommu.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/powerpc/platforms/pseries/iommu.c b/arch/powerpc/platforms/pseries/iommu.c
index 0dbadbb34f3a..dae3f8847117 100644
--- a/arch/powerpc/platforms/pseries/iommu.c
+++ b/arch/powerpc/platforms/pseries/iommu.c
@@ -530,10 +530,7 @@ static void pci_dma_dev_setup_pSeriesLP(struct pci_dev *dev)
530 } 530 }
531 pr_debug(" parent is %s\n", pdn->full_name); 531 pr_debug(" parent is %s\n", pdn->full_name);
532 532
533 /* Check for parent == NULL so we don't try to setup the empty EADS 533 if (dma_window == NULL) {
534 * slots on POWER4 machines.
535 */
536 if (dma_window == NULL || pdn->parent == NULL) {
537 pr_debug(" no dma window for device, linking to parent\n"); 534 pr_debug(" no dma window for device, linking to parent\n");
538 set_iommu_table_base(&dev->dev, PCI_DN(pdn)->iommu_table); 535 set_iommu_table_base(&dev->dev, PCI_DN(pdn)->iommu_table);
539 return; 536 return;