diff options
| author | Stephen Warren <swarren@nvidia.com> | 2012-10-23 12:21:39 -0600 |
|---|---|---|
| committer | Stephen Warren <swarren@nvidia.com> | 2012-11-16 12:22:16 -0700 |
| commit | 58664f90525f9f1cef63167ee9ae3d6100f58494 (patch) | |
| tree | 71f2ece79bc4608e5dde2422ab460570145e8a6d /arch/arm/mach-tegra/timer.c | |
| parent | 73368ba0e168f28ec0b3e689bd428edc92505b62 (diff) | |
ARM: timer: fix checkpatch warnings
This prevents checkpatch complaining when this file is moved in a later
patch.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra/timer.c')
| -rw-r--r-- | arch/arm/mach-tegra/timer.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm/mach-tegra/timer.c b/arch/arm/mach-tegra/timer.c index 6ff503536512..afcd108f0f28 100644 --- a/arch/arm/mach-tegra/timer.c +++ b/arch/arm/mach-tegra/timer.c @@ -184,8 +184,7 @@ static void __init tegra_init_timer(void) clk = clk_get_sys("timer", NULL); if (IS_ERR(clk)) { - pr_warn("Unable to get timer clock." - " Assuming 12Mhz input clock.\n"); + pr_warn("Unable to get timer clock. Assuming 12Mhz input clock.\n"); rate = 12000000; } else { clk_prepare_enable(clk); @@ -223,13 +222,13 @@ static void __init tegra_init_timer(void) if (clocksource_mmio_init(timer_reg_base + TIMERUS_CNTR_1US, "timer_us", 1000000, 300, 32, clocksource_mmio_readl_up)) { - printk(KERN_ERR "Failed to register clocksource\n"); + pr_err("Failed to register clocksource\n"); BUG(); } ret = setup_irq(tegra_timer_irq.irq, &tegra_timer_irq); if (ret) { - printk(KERN_ERR "Failed to register timer IRQ: %d\n", ret); + pr_err("Failed to register timer IRQ: %d\n", ret); BUG(); } |