diff options
author | Muli Ben-Yehuda <muli@il.ibm.com> | 2007-07-21 11:11:03 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-21 21:37:11 -0400 |
commit | 7354b07595b2e43b75fe353fcf18e73eb0427c9b (patch) | |
tree | 4eff160b9029cdcdd71b0b96680f1ff3ea0666fe /arch/x86_64 | |
parent | 12de257b83e2fa9343eb7cee70a6edc85b51fbc5 (diff) |
x86_64: Calgary - fix few style problems pointed out by checkpatch.pl
No actual code was harmed in the production of this patch.
Thanks to Andrew Morton <akpm@linux-foundation.org> for telling me
about checkpatch.pl.
Signed-off-by: Muli Ben-Yehuda <muli@il.ibm.com>
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/x86_64')
-rw-r--r-- | arch/x86_64/kernel/pci-calgary.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/arch/x86_64/kernel/pci-calgary.c b/arch/x86_64/kernel/pci-calgary.c index c88e70dcfed4..a2f9c5369292 100644 --- a/arch/x86_64/kernel/pci-calgary.c +++ b/arch/x86_64/kernel/pci-calgary.c | |||
@@ -375,7 +375,9 @@ static inline struct iommu_table *find_iommu_table(struct device *dev) | |||
375 | pbus = pdev->bus; | 375 | pbus = pdev->bus; |
376 | 376 | ||
377 | tbl = pbus->self->sysdata; | 377 | tbl = pbus->self->sysdata; |
378 | BUG_ON(pdev->bus->parent && (tbl->it_busno != pdev->bus->parent->number)); | 378 | |
379 | BUG_ON(pdev->bus->parent && | ||
380 | (tbl->it_busno != pdev->bus->parent->number)); | ||
379 | 381 | ||
380 | return tbl; | 382 | return tbl; |
381 | } | 383 | } |
@@ -941,7 +943,8 @@ static void calioc2_dump_error_regs(struct iommu_table *tbl) | |||
941 | /* dump rest of error regs */ | 943 | /* dump rest of error regs */ |
942 | printk(KERN_EMERG "Calgary: "); | 944 | printk(KERN_EMERG "Calgary: "); |
943 | for (i = 0; i < ARRAY_SIZE(errregs); i++) { | 945 | for (i = 0; i < ARRAY_SIZE(errregs); i++) { |
944 | erroff = (0x810 + (i * 0x10)); /* err regs are at 0x810 - 0x870 */ | 946 | /* err regs are at 0x810 - 0x870 */ |
947 | erroff = (0x810 + (i * 0x10)); | ||
945 | target = calgary_reg(bbar, phboff | erroff); | 948 | target = calgary_reg(bbar, phboff | erroff); |
946 | errregs[i] = be32_to_cpu(readl(target)); | 949 | errregs[i] = be32_to_cpu(readl(target)); |
947 | printk("0x%08x@0x%lx ", errregs[i], erroff); | 950 | printk("0x%08x@0x%lx ", errregs[i], erroff); |
@@ -1207,7 +1210,7 @@ static int __init calgary_init(void) | |||
1207 | { | 1210 | { |
1208 | int ret; | 1211 | int ret; |
1209 | struct pci_dev *dev = NULL; | 1212 | struct pci_dev *dev = NULL; |
1210 | void* tce_space; | 1213 | void *tce_space; |
1211 | 1214 | ||
1212 | ret = calgary_locate_bbars(); | 1215 | ret = calgary_locate_bbars(); |
1213 | if (ret) | 1216 | if (ret) |