hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

watchdog: octeon: fix some trivial coding style issues 

Fix some trivial coding style issues to reduce noise from static analyzers.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
This commit is contained in:
Aaro Koskinen 2015-03-28 20:05:39 +02:00 committed by Wim Van Sebroeck
parent 3d588c93c0
commit 8692cf0ad3
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/watchdog/octeon-wdt-main.c
View File

@ -105,10 +105,10 @@ MODULE_PARM_DESC(nowayout,
"Watchdog cannot be stopped once started (default=" "Watchdog cannot be stopped once started (default="
__MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
static u32 __initdata nmi_stage1_insns[64]; static u32 nmi_stage1_insns[64] __initdata;
/* We need one branch and therefore one relocation per target label. */ /* We need one branch and therefore one relocation per target label. */
static struct uasm_label __initdata labels[5]; static struct uasm_label labels[5] __initdata;
static struct uasm_reloc __initdata relocs[5]; static struct uasm_reloc relocs[5] __initdata;
enum lable_id { enum lable_id {
label_enter_bootloader = 1 label_enter_bootloader = 1
@ -217,7 +217,8 @@ static void __init octeon_wdt_build_stage1(void)
pr_debug("\t.set pop\n"); pr_debug("\t.set pop\n");
if (len > 32) if (len > 32)
panic("NMI stage 1 handler exceeds 32 instructions, was %d\n", len); panic("NMI stage 1 handler exceeds 32 instructions, was %d\n",
len);
} }
static int cpu2core(int cpu) static int cpu2core(int cpu)
@ -293,6 +294,7 @@ static void octeon_wdt_write_hex(u64 value, int digits)
{ {
int d; int d;
int v; int v;
for (d = 0; d < digits; d++) { for (d = 0; d < digits; d++) {
v = (value >> ((digits - d - 1) * 4)) & 0xf; v = (value >> ((digits - d - 1) * 4)) & 0xf;
if (v >= 10) if (v >= 10)
@ -302,7 +304,7 @@ static void octeon_wdt_write_hex(u64 value, int digits)
} }
} }
const char *reg_name[] = { static const char *reg_name[] = {
"$0", "at", "v0", "v1", "a0", "a1", "a2", "a3", "$0", "at", "v0", "v1", "a0", "a1", "a2", "a3",
"a4", "a5", "a6", "a7", "t0", "t1", "t2", "t3", "a4", "a5", "a6", "a7", "t0", "t1", "t2", "t3",
"s0", "s1", "s2", "s3", "s4", "s5", "s6", "s7", "s0", "s1", "s2", "s3", "s4", "s5", "s6", "s7",
@ -456,6 +458,7 @@ static int octeon_wdt_ping(struct watchdog_device __always_unused *wdog)
!cpumask_test_cpu(cpu, &irq_enabled_cpus)) { !cpumask_test_cpu(cpu, &irq_enabled_cpus)) {
/* We have to enable the irq */ /* We have to enable the irq */
int irq = OCTEON_IRQ_WDOG0 + coreid; int irq = OCTEON_IRQ_WDOG0 + coreid;
enable_irq(irq); enable_irq(irq);
cpumask_set_cpu(cpu, &irq_enabled_cpus); cpumask_set_cpu(cpu, &irq_enabled_cpus);
} }
@ -573,7 +576,8 @@ static int __init octeon_wdt_init(void)
max_timeout_sec = 6; max_timeout_sec = 6;
do { do {
max_timeout_sec--; max_timeout_sec--;
timeout_cnt = ((octeon_get_io_clock_rate() >> 8) * max_timeout_sec) >> 8; timeout_cnt = ((octeon_get_io_clock_rate() >> 8) *
max_timeout_sec) >> 8;
} while (timeout_cnt > 65535); } while (timeout_cnt > 65535);
BUG_ON(timeout_cnt == 0); BUG_ON(timeout_cnt == 0);