From e4d2fdb96bfb813c29f3f1b04a4bd5088e013586 Mon Sep 17 00:00:00 2001 From: Muli Ben-Yehuda Date: Sat, 21 Jul 2007 17:11:03 +0200 Subject: [PATCH] --- yaml --- r: 62417 b: refs/heads/master c: 7354b07595b2e43b75fe353fcf18e73eb0427c9b h: refs/heads/master i: 62415: 443b8456891fbe991d670c77ecaf26216d51b25e v: v3 --- [refs] | 2 +- trunk/arch/x86_64/kernel/pci-calgary.c | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index ec4bb47c7f37..6218f03dfd91 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 12de257b83e2fa9343eb7cee70a6edc85b51fbc5 +refs/heads/master: 7354b07595b2e43b75fe353fcf18e73eb0427c9b diff --git a/trunk/arch/x86_64/kernel/pci-calgary.c b/trunk/arch/x86_64/kernel/pci-calgary.c index c88e70dcfed4..a2f9c5369292 100644 --- a/trunk/arch/x86_64/kernel/pci-calgary.c +++ b/trunk/arch/x86_64/kernel/pci-calgary.c @@ -375,7 +375,9 @@ static inline struct iommu_table *find_iommu_table(struct device *dev) pbus = pdev->bus; tbl = pbus->self->sysdata; - BUG_ON(pdev->bus->parent && (tbl->it_busno != pdev->bus->parent->number)); + + BUG_ON(pdev->bus->parent && + (tbl->it_busno != pdev->bus->parent->number)); return tbl; } @@ -941,7 +943,8 @@ static void calioc2_dump_error_regs(struct iommu_table *tbl) /* dump rest of error regs */ printk(KERN_EMERG "Calgary: "); for (i = 0; i < ARRAY_SIZE(errregs); i++) { - erroff = (0x810 + (i * 0x10)); /* err regs are at 0x810 - 0x870 */ + /* err regs are at 0x810 - 0x870 */ + erroff = (0x810 + (i * 0x10)); target = calgary_reg(bbar, phboff | erroff); errregs[i] = be32_to_cpu(readl(target)); printk("0x%08x@0x%lx ", errregs[i], erroff); @@ -1207,7 +1210,7 @@ static int __init calgary_init(void) { int ret; struct pci_dev *dev = NULL; - void* tce_space; + void *tce_space; ret = calgary_locate_bbars(); if (ret)