diff options
Diffstat (limited to 'arch/mips/sgi-ip32')
-rw-r--r-- | arch/mips/sgi-ip32/crime.c | 6 | ||||
-rw-r--r-- | arch/mips/sgi-ip32/ip32-irq.c | 26 | ||||
-rw-r--r-- | arch/mips/sgi-ip32/ip32-memory.c | 4 |
3 files changed, 18 insertions, 18 deletions
diff --git a/arch/mips/sgi-ip32/crime.c b/arch/mips/sgi-ip32/crime.c index bff508704d03..563c614ad021 100644 --- a/arch/mips/sgi-ip32/crime.c +++ b/arch/mips/sgi-ip32/crime.c | |||
@@ -35,8 +35,8 @@ void __init crime_init(void) | |||
35 | id = crime->id; | 35 | id = crime->id; |
36 | rev = id & CRIME_ID_REV; | 36 | rev = id & CRIME_ID_REV; |
37 | id = (id & CRIME_ID_IDBITS) >> 4; | 37 | id = (id & CRIME_ID_IDBITS) >> 4; |
38 | printk (KERN_INFO "CRIME id %1x rev %d at 0x%0*lx\n", | 38 | printk(KERN_INFO "CRIME id %1x rev %d at 0x%0*lx\n", |
39 | id, rev, field, (unsigned long) CRIME_BASE); | 39 | id, rev, field, (unsigned long) CRIME_BASE); |
40 | } | 40 | } |
41 | 41 | ||
42 | irqreturn_t crime_memerr_intr(unsigned int irq, void *dev_id) | 42 | irqreturn_t crime_memerr_intr(unsigned int irq, void *dev_id) |
@@ -96,7 +96,7 @@ irqreturn_t crime_cpuerr_intr(unsigned int irq, void *dev_id) | |||
96 | unsigned long addr = crime->cpu_error_addr & CRIME_CPU_ERROR_ADDR_MASK; | 96 | unsigned long addr = crime->cpu_error_addr & CRIME_CPU_ERROR_ADDR_MASK; |
97 | 97 | ||
98 | addr <<= 2; | 98 | addr <<= 2; |
99 | printk ("CRIME CPU error at 0x%09lx status 0x%08lx\n", addr, stat); | 99 | printk("CRIME CPU error at 0x%09lx status 0x%08lx\n", addr, stat); |
100 | crime->cpu_error_stat = 0; | 100 | crime->cpu_error_stat = 0; |
101 | 101 | ||
102 | return IRQ_HANDLED; | 102 | return IRQ_HANDLED; |
diff --git a/arch/mips/sgi-ip32/ip32-irq.c b/arch/mips/sgi-ip32/ip32-irq.c index 002095b364a3..7f4b793c3df3 100644 --- a/arch/mips/sgi-ip32/ip32-irq.c +++ b/arch/mips/sgi-ip32/ip32-irq.c | |||
@@ -148,7 +148,7 @@ static void disable_cpu_irq(unsigned int irq) | |||
148 | static void end_cpu_irq(unsigned int irq) | 148 | static void end_cpu_irq(unsigned int irq) |
149 | { | 149 | { |
150 | if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS))) | 150 | if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS))) |
151 | enable_cpu_irq (irq); | 151 | enable_cpu_irq(irq); |
152 | } | 152 | } |
153 | 153 | ||
154 | static struct irq_chip ip32_cpu_interrupt = { | 154 | static struct irq_chip ip32_cpu_interrupt = { |
@@ -289,11 +289,11 @@ static struct irq_chip ip32_macepci_interrupt = { | |||
289 | 289 | ||
290 | static unsigned long maceisa_mask; | 290 | static unsigned long maceisa_mask; |
291 | 291 | ||
292 | static void enable_maceisa_irq (unsigned int irq) | 292 | static void enable_maceisa_irq(unsigned int irq) |
293 | { | 293 | { |
294 | unsigned int crime_int = 0; | 294 | unsigned int crime_int = 0; |
295 | 295 | ||
296 | DBG ("maceisa enable: %u\n", irq); | 296 | DBG("maceisa enable: %u\n", irq); |
297 | 297 | ||
298 | switch (irq) { | 298 | switch (irq) { |
299 | case MACEISA_AUDIO_SW_IRQ ... MACEISA_AUDIO3_MERR_IRQ: | 299 | case MACEISA_AUDIO_SW_IRQ ... MACEISA_AUDIO3_MERR_IRQ: |
@@ -306,7 +306,7 @@ static void enable_maceisa_irq (unsigned int irq) | |||
306 | crime_int = MACE_SUPERIO_INT; | 306 | crime_int = MACE_SUPERIO_INT; |
307 | break; | 307 | break; |
308 | } | 308 | } |
309 | DBG ("crime_int %08x enabled\n", crime_int); | 309 | DBG("crime_int %08x enabled\n", crime_int); |
310 | crime_mask |= crime_int; | 310 | crime_mask |= crime_int; |
311 | crime->imask = crime_mask; | 311 | crime->imask = crime_mask; |
312 | maceisa_mask |= 1 << (irq - 33); | 312 | maceisa_mask |= 1 << (irq - 33); |
@@ -397,15 +397,15 @@ static struct irq_chip ip32_mace_interrupt = { | |||
397 | 397 | ||
398 | static void ip32_unknown_interrupt(void) | 398 | static void ip32_unknown_interrupt(void) |
399 | { | 399 | { |
400 | printk ("Unknown interrupt occurred!\n"); | 400 | printk("Unknown interrupt occurred!\n"); |
401 | printk ("cp0_status: %08x\n", read_c0_status()); | 401 | printk("cp0_status: %08x\n", read_c0_status()); |
402 | printk ("cp0_cause: %08x\n", read_c0_cause()); | 402 | printk("cp0_cause: %08x\n", read_c0_cause()); |
403 | printk ("CRIME intr mask: %016lx\n", crime->imask); | 403 | printk("CRIME intr mask: %016lx\n", crime->imask); |
404 | printk ("CRIME intr status: %016lx\n", crime->istat); | 404 | printk("CRIME intr status: %016lx\n", crime->istat); |
405 | printk ("CRIME hardware intr register: %016lx\n", crime->hard_int); | 405 | printk("CRIME hardware intr register: %016lx\n", crime->hard_int); |
406 | printk ("MACE ISA intr mask: %08lx\n", mace->perif.ctrl.imask); | 406 | printk("MACE ISA intr mask: %08lx\n", mace->perif.ctrl.imask); |
407 | printk ("MACE ISA intr status: %08lx\n", mace->perif.ctrl.istat); | 407 | printk("MACE ISA intr status: %08lx\n", mace->perif.ctrl.istat); |
408 | printk ("MACE PCI control register: %08x\n", mace->pci.control); | 408 | printk("MACE PCI control register: %08x\n", mace->pci.control); |
409 | 409 | ||
410 | printk("Register dump:\n"); | 410 | printk("Register dump:\n"); |
411 | show_regs(get_irq_regs()); | 411 | show_regs(get_irq_regs()); |
diff --git a/arch/mips/sgi-ip32/ip32-memory.c b/arch/mips/sgi-ip32/ip32-memory.c index 849d392a0013..ca93ecf825ae 100644 --- a/arch/mips/sgi-ip32/ip32-memory.c +++ b/arch/mips/sgi-ip32/ip32-memory.c | |||
@@ -19,7 +19,7 @@ | |||
19 | 19 | ||
20 | extern void crime_init(void); | 20 | extern void crime_init(void); |
21 | 21 | ||
22 | void __init prom_meminit (void) | 22 | void __init prom_meminit(void) |
23 | { | 23 | { |
24 | u64 base, size; | 24 | u64 base, size; |
25 | int bank; | 25 | int bank; |
@@ -38,7 +38,7 @@ void __init prom_meminit (void) | |||
38 | 38 | ||
39 | printk("CRIME MC: bank %u base 0x%016lx size %luMiB\n", | 39 | printk("CRIME MC: bank %u base 0x%016lx size %luMiB\n", |
40 | bank, base, size >> 20); | 40 | bank, base, size >> 20); |
41 | add_memory_region (base, size, BOOT_MEM_RAM); | 41 | add_memory_region(base, size, BOOT_MEM_RAM); |
42 | } | 42 | } |
43 | } | 43 | } |
44 | 44 | ||