aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel/iommu.c
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2007-12-05 21:39:19 -0500
committerPaul Mackerras <paulus@samba.org>2007-12-10 21:41:33 -0500
commit68d315f5975c05595af52e3b758b5b6ebae1a266 (patch)
treec0578f97815519a841cc88328c4fd4b91c42b111 /arch/powerpc/kernel/iommu.c
parent0d9dc4b473f7224cc1798c96d5dba84b69212163 (diff)
[POWERPC] iommu_free_table doesn't need the device_node
It only needs the iommu_table address. It also makes use of the node name to print error messages. So just pass it the things it needs. This reduces the places that know about the pci_dn by one. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/kernel/iommu.c')
-rw-r--r--arch/powerpc/kernel/iommu.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/arch/powerpc/kernel/iommu.c b/arch/powerpc/kernel/iommu.c
index 2d0c9ef555e9..47c3fe55242f 100644
--- a/arch/powerpc/kernel/iommu.c
+++ b/arch/powerpc/kernel/iommu.c
@@ -526,16 +526,14 @@ struct iommu_table *iommu_init_table(struct iommu_table *tbl, int nid)
526 return tbl; 526 return tbl;
527} 527}
528 528
529void iommu_free_table(struct device_node *dn) 529void iommu_free_table(struct iommu_table *tbl, const char *node_name)
530{ 530{
531 struct pci_dn *pdn = dn->data;
532 struct iommu_table *tbl = pdn->iommu_table;
533 unsigned long bitmap_sz, i; 531 unsigned long bitmap_sz, i;
534 unsigned int order; 532 unsigned int order;
535 533
536 if (!tbl || !tbl->it_map) { 534 if (!tbl || !tbl->it_map) {
537 printk(KERN_ERR "%s: expected TCE map for %s\n", __FUNCTION__, 535 printk(KERN_ERR "%s: expected TCE map for %s\n", __FUNCTION__,
538 dn->full_name); 536 node_name);
539 return; 537 return;
540 } 538 }
541 539
@@ -544,7 +542,7 @@ void iommu_free_table(struct device_node *dn)
544 for (i = 0; i < (tbl->it_size/64); i++) { 542 for (i = 0; i < (tbl->it_size/64); i++) {
545 if (tbl->it_map[i] != 0) { 543 if (tbl->it_map[i] != 0) {
546 printk(KERN_WARNING "%s: Unexpected TCEs for %s\n", 544 printk(KERN_WARNING "%s: Unexpected TCEs for %s\n",
547 __FUNCTION__, dn->full_name); 545 __FUNCTION__, node_name);
548 break; 546 break;
549 } 547 }
550 } 548 }