aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/platforms/cell
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-07-24 17:07:22 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2012-07-24 17:07:22 -0400
commitf14121ab35912e3d2e57ac9a4ce1f9d4b7baeffb (patch)
tree7d5b4799998760e0a88166185abff1147d4ee04d /arch/powerpc/platforms/cell
parent914311c9fb9bc01a215de9d848b72b5449c0e342 (diff)
parente95d8aafa5d911bf523bc47fe89f3336eb8a1b51 (diff)
Merge tag 'dt-for-3.6' of git://sources.calxeda.com/kernel/linux
Pull devicetree updates from Rob Herring: "A small set of changes for devicetree: - Couple of Documentation fixes - Addition of new helper function of_node_full_name - Improve of_parse_phandle_with_args return values - Some NULL related sparse fixes" Grant's busy packing. * tag 'dt-for-3.6' of git://sources.calxeda.com/kernel/linux: of: mtd: nuke useless const qualifier devicetree: add helper inline for retrieving a node's full name of: return -ENOENT when no property usage-model.txt: fix typo machine_init->init_machine of: Fix null pointer related warnings in base.c file LED: Fix missing semicolon in OF documentation of: fix a few typos in the binding documentation
Diffstat (limited to 'arch/powerpc/platforms/cell')
-rw-r--r--arch/powerpc/platforms/cell/iommu.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/cell/iommu.c b/arch/powerpc/platforms/cell/iommu.c
index c264969c9319..dca213666747 100644
--- a/arch/powerpc/platforms/cell/iommu.c
+++ b/arch/powerpc/platforms/cell/iommu.c
@@ -551,8 +551,7 @@ static struct iommu_table *cell_get_iommu_table(struct device *dev)
551 iommu = cell_iommu_for_node(dev_to_node(dev)); 551 iommu = cell_iommu_for_node(dev_to_node(dev));
552 if (iommu == NULL || list_empty(&iommu->windows)) { 552 if (iommu == NULL || list_empty(&iommu->windows)) {
553 printk(KERN_ERR "iommu: missing iommu for %s (node %d)\n", 553 printk(KERN_ERR "iommu: missing iommu for %s (node %d)\n",
554 dev->of_node ? dev->of_node->full_name : "?", 554 of_node_full_name(dev->of_node), dev_to_node(dev));
555 dev_to_node(dev));
556 return NULL; 555 return NULL;
557 } 556 }
558 window = list_entry(iommu->windows.next, struct iommu_window, list); 557 window = list_entry(iommu->windows.next, struct iommu_window, list);