powerpc/pseries: Checking for pdn->parent is redundant
authorNishanth Aravamudan <nacc@us.ibm.com>
Tue, 26 Oct 2010 17:35:14 +0000 (17:35 +0000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Thu, 9 Dec 2010 04:17:50 +0000 (15:17 +1100)
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>
arch/powerpc/platforms/pseries/iommu.c

index 0dbadbb..dae3f88 100644 (file)
@@ -530,10 +530,7 @@ static void pci_dma_dev_setup_pSeriesLP(struct pci_dev *dev)
        }
        pr_debug("  parent is %s\n", pdn->full_name);
 
-       /* Check for parent == NULL so we don't try to setup the empty EADS
-        * slots on POWER4 machines.
-        */
-       if (dma_window == NULL || pdn->parent == NULL) {
+       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;