Commit bb790362 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Guenter Roeck

intel-mid_wdt: Error code is just an integer

Error code when printed is more readable if it's represented as plain decimal
integer. Otherwise user will see something like
	intel_mid_wdt: Error stopping watchdog: 0xffffffed
which is not quite understandable ("Should I interpret it as a bitfield?").

Make it clear to use plaint integer specifier.

While here, move struct device *dev local variable definition to the top of
functions.
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
parent 31ecad65
...@@ -43,6 +43,7 @@ static inline int wdt_command(int sub, u32 *in, int inlen) ...@@ -43,6 +43,7 @@ static inline int wdt_command(int sub, u32 *in, int inlen)
static int wdt_start(struct watchdog_device *wd) static int wdt_start(struct watchdog_device *wd)
{ {
struct device *dev = watchdog_get_drvdata(wd);
int ret, in_size; int ret, in_size;
int timeout = wd->timeout; int timeout = wd->timeout;
struct ipc_wd_start { struct ipc_wd_start {
...@@ -57,36 +58,32 @@ static int wdt_start(struct watchdog_device *wd) ...@@ -57,36 +58,32 @@ static int wdt_start(struct watchdog_device *wd)
in_size = DIV_ROUND_UP(sizeof(ipc_wd_start), 4); in_size = DIV_ROUND_UP(sizeof(ipc_wd_start), 4);
ret = wdt_command(SCU_WATCHDOG_START, (u32 *)&ipc_wd_start, in_size); ret = wdt_command(SCU_WATCHDOG_START, (u32 *)&ipc_wd_start, in_size);
if (ret) { if (ret)
struct device *dev = watchdog_get_drvdata(wd);
dev_crit(dev, "error starting watchdog: %d\n", ret); dev_crit(dev, "error starting watchdog: %d\n", ret);
}
return ret; return ret;
} }
static int wdt_ping(struct watchdog_device *wd) static int wdt_ping(struct watchdog_device *wd)
{ {
struct device *dev = watchdog_get_drvdata(wd);
int ret; int ret;
ret = wdt_command(SCU_WATCHDOG_KEEPALIVE, NULL, 0); ret = wdt_command(SCU_WATCHDOG_KEEPALIVE, NULL, 0);
if (ret) { if (ret)
struct device *dev = watchdog_get_drvdata(wd); dev_crit(dev, "Error executing keepalive: %d\n", ret);
dev_crit(dev, "Error executing keepalive: 0x%x\n", ret);
}
return ret; return ret;
} }
static int wdt_stop(struct watchdog_device *wd) static int wdt_stop(struct watchdog_device *wd)
{ {
struct device *dev = watchdog_get_drvdata(wd);
int ret; int ret;
ret = wdt_command(SCU_WATCHDOG_STOP, NULL, 0); ret = wdt_command(SCU_WATCHDOG_STOP, NULL, 0);
if (ret) { if (ret)
struct device *dev = watchdog_get_drvdata(wd); dev_crit(dev, "Error stopping watchdog: %d\n", ret);
dev_crit(dev, "Error stopping watchdog: 0x%x\n", ret);
}
return ret; return ret;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment