Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8692cf0a authored by Aaro Koskinen's avatar Aaro Koskinen Committed by Wim Van Sebroeck
Browse files

watchdog: octeon: fix some trivial coding style issues 



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

Signed-off-by: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
Reviewed-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
parent 3d588c93

drivers/watchdog/octeon-wdt-main.c

+10 −6
Original line number Diff line number Diff line
@@ -105,10 +105,10 @@ MODULE_PARM_DESC(nowayout, 
	"Watchdog cannot be stopped once started (default="

				__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. */

static struct uasm_label __initdata labels[5];

static struct uasm_reloc __initdata relocs[5];

static struct uasm_label labels[5] __initdata;

static struct uasm_reloc relocs[5] __initdata;



enum lable_id {

	label_enter_bootloader = 1
@@ -217,7 +217,8 @@ static void __init octeon_wdt_build_stage1(void) 
	pr_debug("\t.set pop\n");



	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)
@@ -293,6 +294,7 @@ static void octeon_wdt_write_hex(u64 value, int digits) 
{

	int d;

	int v;



	for (d = 0; d < digits; d++) {

		v = (value >> ((digits - d - 1) * 4)) & 0xf;

		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",

	"a4", "a5", "a6", "a7", "t0", "t1", "t2", "t3",

	"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)) {

			/* We have to enable the irq */

			int irq = OCTEON_IRQ_WDOG0 + coreid;



			enable_irq(irq);

			cpumask_set_cpu(cpu, &irq_enabled_cpus);

		}
@@ -573,7 +576,8 @@ static int __init octeon_wdt_init(void) 
	max_timeout_sec = 6;

	do {

		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);



	BUG_ON(timeout_cnt == 0);