iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ARM: timer: fix checkpatch warnings

Browse Source 
This prevents checkpatch complaining when this file is moved in a later
patch.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
This commit is contained in:
Stephen Warren 2012-10-23 12:21:39 -06:00
parent 73368ba0e1
commit 58664f9052
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
arch/arm/mach-tegra/timer.c
View File

@ -184,8 +184,7 @@ static void __init tegra_init_timer(void)
clk = clk_get_sys("timer", NULL); clk = clk_get_sys("timer", NULL);
if (IS_ERR(clk)) { if (IS_ERR(clk)) {
pr_warn("Unable to get timer clock." pr_warn("Unable to get timer clock. Assuming 12Mhz input clock.\n");
" Assuming 12Mhz input clock.\n");
rate = 12000000; rate = 12000000;
} else { } else {
clk_prepare_enable(clk); 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, if (clocksource_mmio_init(timer_reg_base + TIMERUS_CNTR_1US,
"timer_us", 1000000, 300, 32, clocksource_mmio_readl_up)) { "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(); BUG();
} }
ret = setup_irq(tegra_timer_irq.irq, &tegra_timer_irq); ret = setup_irq(tegra_timer_irq.irq, &tegra_timer_irq);
if (ret) { if (ret) {
printk(KERN_ERR "Failed to register timer IRQ: %d\n", ret); pr_err("Failed to register timer IRQ: %d\n", ret);
BUG(); BUG();
} }