aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNishanth Aravamudan <nacc@us.ibm.com>2010-10-26 17:35:14 +0000
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2010-12-09 15:17:50 +1100
commitf4133236d6473072b5982c1182991eade6ff5bae (patch)
treefda913b77f0a4567c122d1721d63a1232088f53a
parent7372cfb88f71ed975c8588d1ca5ecc8bb9ec7c7b (diff)
downloadkernel_samsung_smdk4412-f4133236d6473072b5982c1182991eade6ff5bae.zip
kernel_samsung_smdk4412-f4133236d6473072b5982c1182991eade6ff5bae.tar.gz
kernel_samsung_smdk4412-f4133236d6473072b5982c1182991eade6ff5bae.tar.bz2
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>
-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 0dbadbb..dae3f88 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)
}
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;