diff options
Diffstat (limited to 'arch/arm/common/sa1111.c')
| -rw-r--r-- | arch/arm/common/sa1111.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/arch/arm/common/sa1111.c b/arch/arm/common/sa1111.c index e57d7e5bf96a..7b69c5f9cd74 100644 --- a/arch/arm/common/sa1111.c +++ b/arch/arm/common/sa1111.c | |||
| @@ -282,8 +282,8 @@ static int sa1111_retrigger_lowirq(struct irq_data *d) | |||
| 282 | } | 282 | } |
| 283 | 283 | ||
| 284 | if (i == 8) | 284 | if (i == 8) |
| 285 | printk(KERN_ERR "Danger Will Robinson: failed to " | 285 | pr_err("Danger Will Robinson: failed to re-trigger IRQ%d\n", |
| 286 | "re-trigger IRQ%d\n", d->irq); | 286 | d->irq); |
| 287 | return i == 8 ? -1 : 0; | 287 | return i == 8 ? -1 : 0; |
| 288 | } | 288 | } |
| 289 | 289 | ||
| @@ -384,8 +384,8 @@ static int sa1111_retrigger_highirq(struct irq_data *d) | |||
| 384 | } | 384 | } |
| 385 | 385 | ||
| 386 | if (i == 8) | 386 | if (i == 8) |
| 387 | printk(KERN_ERR "Danger Will Robinson: failed to " | 387 | pr_err("Danger Will Robinson: failed to re-trigger IRQ%d\n", |
| 388 | "re-trigger IRQ%d\n", d->irq); | 388 | d->irq); |
| 389 | return i == 8 ? -1 : 0; | 389 | return i == 8 ? -1 : 0; |
| 390 | } | 390 | } |
| 391 | 391 | ||
| @@ -740,9 +740,8 @@ static int __sa1111_probe(struct device *me, struct resource *mem, int irq) | |||
| 740 | goto err_unmap; | 740 | goto err_unmap; |
| 741 | } | 741 | } |
| 742 | 742 | ||
| 743 | printk(KERN_INFO "SA1111 Microprocessor Companion Chip: " | 743 | pr_info("SA1111 Microprocessor Companion Chip: silicon revision %lx, metal revision %lx\n", |
| 744 | "silicon revision %lx, metal revision %lx\n", | 744 | (id & SKID_SIREV_MASK) >> 4, id & SKID_MTREV_MASK); |
| 745 | (id & SKID_SIREV_MASK)>>4, (id & SKID_MTREV_MASK)); | ||
| 746 | 745 | ||
| 747 | /* | 746 | /* |
| 748 | * We found it. Wake the chip up, and initialise. | 747 | * We found it. Wake the chip up, and initialise. |